diff options
Diffstat (limited to 'hl/src')
| -rw-r--r-- | hl/src/H5DS.c | 82 | ||||
| -rw-r--r-- | hl/src/H5IM.c | 6 | ||||
| -rw-r--r-- | hl/src/H5LT.c | 2 | ||||
| -rw-r--r-- | hl/src/H5LTparse.c | 60 | ||||
| -rw-r--r-- | hl/src/H5PT.c | 4 | ||||
| -rw-r--r-- | hl/src/H5TB.c | 48 |
6 files changed, 101 insertions, 101 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index e15c132..245a2c5 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -149,10 +149,10 @@ herr_t H5DSattach_scale(hid_t did, * parameter checking *------------------------------------------------------------------------- */ - + if ((is_scale = H5DSis_scale(did)) < 0) return FAIL; - + /* the dataset cannot be a DS dataset */ if ( is_scale == 1) return FAIL; @@ -473,7 +473,7 @@ herr_t H5DSattach_scale(hid_t did, if((tid = H5Aget_type(aid)) < 0) goto out; - + if((ntid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0) goto out; @@ -656,10 +656,10 @@ herr_t H5DSdetach_scale(hid_t did, * parameter checking *------------------------------------------------------------------------- */ - + if ((is_scale = H5DSis_scale(did)) < 0) return FAIL; - + /* the dataset cannot be a DS dataset */ if ( is_scale == 1) return FAIL; @@ -770,7 +770,7 @@ herr_t H5DSdetach_scale(hid_t did, goto out; /* same object, reset */ - if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr) + if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr) { size_t len; @@ -778,13 +778,13 @@ herr_t H5DSdetach_scale(hid_t did, { ((hobj_ref_t *)buf[idx].p)[jj] = ((hobj_ref_t *)buf[idx].p)[jj+1]; } - + buf[idx].len--; len = buf[idx].len; buf[idx].p = realloc( buf[idx].p, len * sizeof(hobj_ref_t)); - + found_ds = 1; - + /* close the dereferenced dataset and break */ if (H5Dclose(dsid_j) < 0) goto out; @@ -831,7 +831,7 @@ herr_t H5DSdetach_scale(hid_t did, if((tid = H5Aget_type(aid)) < 0) goto out; - + if((ntid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0) goto out; @@ -950,17 +950,17 @@ herr_t H5DSdetach_scale(hid_t did, if (H5Tclose(tid) < 0) goto out; - if (dsbuf) + if (dsbuf) { free(dsbuf); dsbuf=NULL; } - if (dsbufn) + if (dsbufn) { free(dsbufn); dsbufn=NULL; } - if (dims) + if (dims) { free(dims); dims=NULL; @@ -976,23 +976,23 @@ out: H5Aclose(aid); H5Tclose(ntid); H5Tclose(tid); - - if (dsbuf) + + if (dsbuf) { free(dsbuf); dsbuf=NULL; } - if (dsbufn) + if (dsbufn) { free(dsbufn); dsbufn=NULL; } - if (dims) + if (dims) { free(dims); dims=NULL; } - if (buf) + if (buf) { free(buf); buf=NULL; @@ -1056,10 +1056,10 @@ htri_t H5DSis_attached(hid_t did, * parameter checking *------------------------------------------------------------------------- */ - + if ((is_scale = H5DSis_scale(did)) < 0) return FAIL; - + /* the dataset cannot be a DS dataset */ if ( is_scale == 1) return FAIL; @@ -1202,10 +1202,10 @@ htri_t H5DSis_attached(hid_t did, if((tid = H5Aget_type(aid)) < 0) goto out; - + if((ntid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0) goto out; - + /* get and save the old reference(s) */ if((sid = H5Aget_space(aid)) < 0) goto out; @@ -1313,8 +1313,8 @@ out: * * hid_t DID; IN: the dataset * unsigned int DIM; IN: the dimension of the dataset -* int *DS_IDX; IN/OUT: on input the dimension scale index to start iterating, -* on output the next index to visit. If NULL, start at +* int *DS_IDX; IN/OUT: on input the dimension scale index to start iterating, +* on output the next index to visit. If NULL, start at * the first position. * H5DS_iterate_t VISITOR; IN: the visitor function * void *VISITOR_DATA; IN: arbitrary data to pass to the visitor function. @@ -1455,7 +1455,7 @@ herr_t H5DSiterate_scales(hid_t did, if((ret_value=(visitor)(did,dim,scale_id,visitor_data))!=0) { /* break */ - + /* close the DS id */ if (H5Dclose(scale_id) < 0) goto out; @@ -1521,7 +1521,7 @@ out: *------------------------------------------------------------------------- */ -herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) +herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) { int has_labels; hid_t sid = -1; /* space ID */ @@ -1573,7 +1573,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) *------------------------------------------------------------------------- */ - if (has_labels == 0) + if (has_labels == 0) { dims[0] = rank; @@ -1626,7 +1626,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) *------------------------------------------------------------------------- */ - else + else { if ((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0) goto out; @@ -1659,7 +1659,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) buf[idx] = NULL; /* free all the ptr's from the H5Aread() */ - for (i = 0; i < (unsigned int) rank; i++) + for (i = 0; i < (unsigned int) rank; i++) { if (buf[i]) free((void *)buf[i]); @@ -1680,13 +1680,13 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) return SUCCEED; /* error zone */ -out: - if (buf) +out: + if (buf) { if (buf[idx]) /* check if we errored during H5Awrite */ buf[idx] = NULL; /* don't free label */ /* free all the ptr's from the H5Aread() */ - for (i = 0; i < (unsigned int) rank; i++) + for (i = 0; i < (unsigned int) rank; i++) { if (buf[i]) free((void *)buf[i]); @@ -1723,7 +1723,7 @@ out: * *------------------------------------------------------------------------- */ -ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) +ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) { int has_labels; hid_t sid = -1; /* space ID */ @@ -1772,12 +1772,12 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) return FAIL; /* return 0 and NULL for label if no label found */ - if (has_labels == 0) + if (has_labels == 0) { if (label) label[0] = 0; return 0; - } + } /*------------------------------------------------------------------------- * open the attribute and read label @@ -1808,7 +1808,7 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) copy_len = MIN(size-1, nbytes); /* copy all/some of the name */ - if (label) + if (label) { memcpy(label, buf[idx], copy_len); @@ -1817,7 +1817,7 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) } /* free all the ptr's from the H5Aread() */ - for (i = 0; i < rank; i++) + for (i = 0; i < rank; i++) { if (buf[i]) free(buf[i]); @@ -1837,11 +1837,11 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) return (ssize_t) nbytes; /* error zone */ -out: - if (buf) +out: + if (buf) { /* free all the ptr's from the H5Aread() */ - for (i = 0; i < rank; i++) + for (i = 0; i < rank; i++) { if (buf[i]) free(buf[i]); @@ -2261,7 +2261,7 @@ herr_t H5DS_is_reserved(hid_t did) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Tclose(tid); H5Aclose(aid); diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index 361a65b..11f4014 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -165,8 +165,8 @@ herr_t H5IMmake_image_24bit( hid_t loc_id, * *------------------------------------------------------------------------- */ -static herr_t find_palette(hid_t loc_id, - const char *name, +static herr_t find_palette(hid_t loc_id, + const char *name, const H5A_info_t *ainfo, void *op_data) { @@ -248,7 +248,7 @@ herr_t H5IMget_image_info( hid_t loc_id, hid_t atid; H5T_class_t aclass; int has_pal; - int has_attr; + int has_attr; /*assume initially we have no palettes attached*/ *npals = 0; diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index d118942..22bb97f 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -1757,7 +1757,7 @@ out: sprintf(tmp_str, "\n%*s <empty>", indt + 4, ""); strcat(str, tmp_str); } /* end if */ - + /* Release resources */ if(name) { for(i = 0; i < nmembs; i++) diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index 98dcbd5..41c4cec 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -17,7 +17,7 @@ * on jam. Do NOT modify it by hand. */ #ifndef lint -static char const +static char const yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $"; #endif #include <stdlib.h> @@ -91,7 +91,7 @@ struct arr_info { }; /*stack for nested array type*/ struct arr_info arr_stack[STACK_SIZE]; -int asindex = -1; /*pointer to the top of array stack*/ +int asindex = -1; /*pointer to the top of array stack*/ hbool_t is_str_size = 0; /*flag to lexer for string size*/ hbool_t is_str_pad = 0; /*flag to lexer for string padding*/ @@ -99,7 +99,7 @@ H5T_pad_t str_pad; /*variable for string padding*/ H5T_cset_t str_cset; /*variable for string character set*/ hbool_t is_variable = 0; /*variable for variable-length string*/ size_t str_size; /*variable for string size*/ - + hid_t enum_id; /*type ID*/ hbool_t is_enum = 0; /*flag to lexer for enum type*/ hbool_t is_enum_memb = 0; /*flag to lexer for enum member*/ @@ -822,9 +822,9 @@ case 46: break; case 47: #line 156 "H5LTparse.y" -{ yyval.ival = cmpd_stack[csindex].id; +{ yyval.ival = cmpd_stack[csindex].id; cmpd_stack[csindex].id = 0; - cmpd_stack[csindex].first_memb = 1; + cmpd_stack[csindex].first_memb = 1; csindex--; } break; @@ -834,7 +834,7 @@ case 50: break; case 51: #line 167 "H5LTparse.y" -{ +{ size_t origin_size, new_size; hid_t dtype_id = cmpd_stack[csindex].id; @@ -848,7 +848,7 @@ case 51: cmpd_stack[csindex].first_memb = 0; } else { origin_size = H5Tget_size(dtype_id); - + if(yyvsp[-1].ival == 0) { new_size = origin_size + H5Tget_size(yyvsp[-6].ival); H5Tset_size(dtype_id, new_size); @@ -859,10 +859,10 @@ case 51: H5Tinsert(dtype_id, yyvsp[-3].sval, yyvsp[-1].ival, yyvsp[-6].ival); } } - + cmpd_stack[csindex].is_field = 0; H5Tclose(yyvsp[-6].ival); - + new_size = H5Tget_size(dtype_id); } break; @@ -886,7 +886,7 @@ case 56: break; case 57: #line 213 "H5LTparse.y" -{ +{ yyval.ival = H5Tarray_create2(yyvsp[-1].ival, arr_stack[asindex].ndims, arr_stack[asindex].dims); arr_stack[asindex].ndims = 0; asindex--; @@ -900,9 +900,9 @@ break; case 61: #line 224 "H5LTparse.y" { unsigned ndims = arr_stack[asindex].ndims; - arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; + arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; arr_stack[asindex].ndims++; - arr_stack[asindex].is_dim = 0; + arr_stack[asindex].is_dim = 0; } break; case 64: @@ -915,10 +915,10 @@ case 65: break; case 66: #line 241 "H5LTparse.y" -{ +{ size_t size = (size_t)yylval.ival; yyval.ival = H5Tcreate(H5T_OPAQUE, size); - is_opq_size = 0; + is_opq_size = 0; } break; case 67: @@ -927,7 +927,7 @@ case 67: break; case 68: #line 247 "H5LTparse.y" -{ +{ H5Tset_tag(yyvsp[-6].ival, yylval.sval); is_opq_tag = 0; } @@ -942,12 +942,12 @@ case 72: break; case 73: #line 260 "H5LTparse.y" -{ +{ if(yyvsp[-1].ival == H5T_VARIABLE_TOKEN) is_variable = 1; - else + else str_size = yylval.ival; - is_str_size = 0; + is_str_size = 0; } break; case 74: @@ -963,7 +963,7 @@ case 74: break; case 75: #line 277 "H5LTparse.y" -{ +{ if(yyvsp[-1].ival == H5T_CSET_ASCII_TOKEN) str_cset = H5T_CSET_ASCII; else if(yyvsp[-1].ival == H5T_CSET_UTF8_TOKEN) @@ -981,7 +981,7 @@ case 76: break; case 77: #line 291 "H5LTparse.y" -{ +{ hid_t str_id = yyvsp[-1].ival; /*set string size*/ @@ -990,12 +990,12 @@ case 77: is_variable = 0; } else H5Tset_size(str_id, str_size); - + /*set string padding and character set*/ H5Tset_strpad(str_id, str_pad); H5Tset_cset(str_id, str_cset); - yyval.ival = str_id; + yyval.ival = str_id; } break; case 78: @@ -1042,7 +1042,7 @@ case 91: #line 330 "H5LTparse.y" { is_enum_memb = 1; /*indicate member of enum*/ - enum_memb_symbol = strdup(yylval.sval); + enum_memb_symbol = strdup(yylval.sval); } break; case 92: @@ -1057,32 +1057,32 @@ case 92: hid_t native = H5Tget_native_type(super, H5T_DIR_ASCEND); H5T_order_t super_order = H5Tget_order(super); H5T_order_t native_order = H5Tget_order(native); - + if(is_enum && is_enum_memb) { /*if it's an enum member*/ /*To handle machines of different endianness*/ if(H5Tequal(native, H5T_NATIVE_SCHAR) || H5Tequal(native, H5T_NATIVE_UCHAR)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &char_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &char_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &char_val); } else if(H5Tequal(native, H5T_NATIVE_SHORT) || H5Tequal(native, H5T_NATIVE_USHORT)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &short_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &short_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &short_val); } else if(H5Tequal(native, H5T_NATIVE_INT) || H5Tequal(native, H5T_NATIVE_UINT)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &int_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &int_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &int_val); } else if(H5Tequal(native, H5T_NATIVE_LONG) || H5Tequal(native, H5T_NATIVE_ULONG)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &long_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &long_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &long_val); } else if(H5Tequal(native, H5T_NATIVE_LLONG) || H5Tequal(native, H5T_NATIVE_ULLONG)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &llong_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &llong_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &llong_val); } - is_enum_memb = 0; + is_enum_memb = 0; if(enum_memb_symbol) free(enum_memb_symbol); } diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c index 3d16db5..ff4347a 100644 --- a/hl/src/H5PT.c +++ b/hl/src/H5PT.c @@ -215,8 +215,8 @@ out: * Modifications: * * John Mainzer -- 4/23/08 - * Added error check on malloc of table, initialized fields - * in table to keep lower level code from choking on bogus + * Added error check on malloc of table, initialized fields + * in table to keep lower level code from choking on bogus * data in error cases. * *------------------------------------------------------------------------- diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c index b9cb73c..6edc244 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -181,7 +181,7 @@ herr_t H5TBmake_table( const char *table_title, /* attach the FIELD_ name attribute */ for ( i = 0; i < nfields; i++) - { + { /* get the member name */ member_name = H5Tget_member_name( mem_type_id,(unsigned) i ); @@ -339,7 +339,7 @@ herr_t H5TBappend_records( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(mem_type_id); @@ -443,7 +443,7 @@ herr_t H5TBwrite_records( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(mem_type_id); @@ -607,7 +607,7 @@ herr_t H5TBwrite_fields_name( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Pclose(preserve_id); H5Dclose(did); @@ -766,7 +766,7 @@ herr_t H5TBwrite_fields_index( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Pclose(preserve_id); H5Dclose(did); @@ -856,7 +856,7 @@ herr_t H5TBread_table( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(mem_type_id); @@ -1091,7 +1091,7 @@ herr_t H5TBread_fields_name( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(mem_type_id); @@ -1247,7 +1247,7 @@ herr_t H5TBread_fields_index( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(read_type_id); @@ -1414,7 +1414,7 @@ out: if (tmp_buf !=NULL ) free( tmp_buf ); - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(tid); @@ -1574,7 +1574,7 @@ herr_t H5TBinsert_record( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Sclose(sid); @@ -1711,7 +1711,7 @@ herr_t H5TBadd_records_from( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did_1); H5Sclose(sid_1); @@ -2065,7 +2065,7 @@ herr_t H5TBcombine_tables( hid_t loc_id1, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did_1); H5Sclose(sid_1); @@ -2220,7 +2220,7 @@ herr_t H5TBinsert_field( hid_t loc_id, if (inserted ) idx = i - 1; - if (i == position ) + if (i == position ) { /* get the new member size */ new_member_size = H5Tget_size( field_type ); @@ -2502,7 +2502,7 @@ herr_t H5TBinsert_field( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did_1); H5Sclose(sid_1); @@ -2614,7 +2614,7 @@ herr_t H5TBdelete_field( hid_t loc_id, /* check out the field */ for ( i = 0; i < nfields; i++) - { + { /* get the member name */ member_name = H5Tget_member_name( tid_1,(unsigned) i ); @@ -2673,7 +2673,7 @@ herr_t H5TBdelete_field( hid_t loc_id, /* insert the old fields except the one to delete */ for ( i = 0; i < nfields; i++) - { + { /* get the member name */ member_name = H5Tget_member_name( tid_1, (unsigned) i ); @@ -2751,13 +2751,13 @@ herr_t H5TBdelete_field( hid_t loc_id, * we have to read field by field of the old dataset and save it into the new one *------------------------------------------------------------------------- */ - for ( i = 0; i < nfields; i++) + for ( i = 0; i < nfields; i++) { /* get the member name */ member_name = H5Tget_member_name(tid_1, (unsigned)i); /* skip the field to delete */ - if (H5TB_find_field(member_name, field_name) > 0) + if (H5TB_find_field(member_name, field_name) > 0) { free(member_name); continue; @@ -2951,7 +2951,7 @@ herr_t H5TBdelete_field( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did_1); H5Sclose(sid_1); @@ -3101,7 +3101,7 @@ out: * * Comments: * -* Modifications: +* Modifications: * May 08, 2003 * In version 2.0 of Table, the number of records is stored as an * attribute "NROWS" @@ -3178,7 +3178,7 @@ herr_t H5TBget_table_info ( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Sclose(sid); @@ -3284,7 +3284,7 @@ herr_t H5TBget_field_info( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(tid); @@ -3455,7 +3455,7 @@ hid_t H5TB_create_type(hid_t loc_id, for ( i = 0; i < nfields; i++) { - if ((fnames[i] = (char*) malloc(sizeof(char)*HLTB_MAX_FIELD_LEN))==NULL) + if ((fnames[i] = (char*) malloc(sizeof(char)*HLTB_MAX_FIELD_LEN))==NULL) { free(fnames); return -1; @@ -3501,7 +3501,7 @@ hid_t H5TB_create_type(hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Tclose(mtype_id); H5Tclose(nmtype_id); |