From 3ad1acdd03af28a780b1ee3827232a0dc3bbda82 Mon Sep 17 00:00:00 2001 From: MuQun Yang Date: Mon, 12 Mar 2001 15:26:18 -0500 Subject: [svn-r3611] Purpose: avoid a windows bug for string handling Description: Solution: Platforms tested: windows 2000, linux --- tools/h4toh5/h4toh5test.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/h4toh5/h4toh5test.c b/tools/h4toh5/h4toh5test.c index ea971a7..333d49f 100644 --- a/tools/h4toh5/h4toh5test.c +++ b/tools/h4toh5/h4toh5test.c @@ -1177,8 +1177,6 @@ int test_imageattr() { uint8 palette_data[NUM_COLORS * 3]; int32 num_comp,num_entries; intn i, j; - char* ri_attrname; - char*file_attrname; /* Open the file. */ file_id = Hopen(FILEGRPAL, DFACC_CREATE, 0); @@ -1219,23 +1217,17 @@ int test_imageattr() { /* set GR global attribute. */ - file_attrname=malloc(strlen(F_ATT1_NAME)); - strcpy(file_attrname,F_ATT1_NAME); - istat = GRsetattr(gr_id,file_attrname,DFNT_CHAR8,F_ATT1_N_VALUES,(VOIDP)F_ATT1_VAL); + istat = GRsetattr(gr_id,"File Attribute",DFNT_CHAR8,F_ATT1_N_VALUES,(VOIDP)F_ATT1_VAL); if(istat == FAIL) { printf("fail to set GR global attribute.\n"); return FAIL; } /* set GR attribute. */ - ri_attrname=malloc(strlen(RI_ATT1_NAME)); - strcpy(ri_attrname,RI_ATT1_NAME); - istat = GRsetattr(ri_id,ri_attrname,DFNT_CHAR8,RI_ATT1_N_VALUES,(VOIDP)RI_ATT1_VAL); + istat = GRsetattr(ri_id,"Image Attribute",DFNT_CHAR8,RI_ATT1_N_VALUES,(VOIDP)RI_ATT1_VAL); if(istat == FAIL) { printf("fail to set GR attribute.\n"); return FAIL; } - free(file_attrname); - free(ri_attrname); /* Write the stored data to the image array. */ istat = GRwriteimage(ri_id, start, NULL, edges, (VOIDP)image_data); if(istat == FAIL) { -- cgit v0.12