summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2011-10-14 19:31:53 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2011-10-14 19:31:53 (GMT)
commitfb6a34f2083cb669573ae388f381523272aa676b (patch)
tree8edd41bbc4ad0c9e1abe0ac7e01b079dedd18973
parent3a4d03625fd1d15ac3c14d086b9b53dfc2285e13 (diff)
downloadhdf5-fb6a34f2083cb669573ae388f381523272aa676b.zip
hdf5-fb6a34f2083cb669573ae388f381523272aa676b.tar.gz
hdf5-fb6a34f2083cb669573ae388f381523272aa676b.tar.bz2
[svn-r21571] Revision of the fix for Issue 7701 (H5LTdtype_to_text): I revised the code per Quincey's comments. (I changed the 1.8 branch first. I'm aware of that.)
Tested on jam. But I tested the same change in 1.8 branch with h5committest.
-rw-r--r--hl/src/H5LT.c177
1 files changed, 88 insertions, 89 deletions
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 1d23685..4e88053 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -26,7 +26,7 @@
#define MAX(a,b) (((a)>(b)) ? (a) : (b))
int input_len;
char *myinput;
-int indent = 0;
+size_t indent = 0;
@@ -1635,6 +1635,7 @@ static char*
realloc_and_append(hbool_t _no_user_buf, size_t *len, char *buf, char *str_to_add)
{
if(_no_user_buf) {
+ /* If the buffer isn't big enough, reallocate it. Otherwise, go to do strcat. */
if(str_to_add && ((ssize_t)(*len - (strlen(buf) + strlen(str_to_add) + 1)) < LIMIT)) {
*len += ((strlen(buf) + strlen(str_to_add) + 1) / INCREMENT + 1) * INCREMENT;
buf = (char*)realloc(buf, *len);
@@ -1672,16 +1673,15 @@ out:
*-------------------------------------------------------------------------
*/
static char*
-indentation(int x, char* str, hbool_t no_u_buf, size_t *s_len)
+indentation(size_t x, char* str, hbool_t no_u_buf, size_t *s_len)
{
char tmp_str[256];
if (x < 80) {
- sprintf(tmp_str, " ");
- while (x-- > 1)
- strcat(tmp_str, " ");
+ memset(tmp_str, ' ', x);
+ tmp_str[x]='\0';
} else
- sprintf(tmp_str, "error: the indentation exceeds the number of cols.");
+ snprintf(tmp_str, *s_len, "error: the indentation exceeds the number of cols.");
if(!(str = realloc_and_append(no_u_buf, s_len, str, tmp_str)))
goto out;
@@ -1705,7 +1705,7 @@ out:
*
*-----------------------------------------------------------------------*/
static char*
-print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, int indt)
+print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, size_t indt)
{
char **name = NULL; /*member names */
unsigned char *value = NULL; /*value array */
@@ -1764,10 +1764,10 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, int indt)
for (i = 0; i < nmembs; i++) {
if(!(str = indentation(indt + COL, str, no_ubuf, str_len)))
goto out;
- nchars = sprintf(tmp_str, "\"%s\"", name[i]);
+ nchars = snprintf(tmp_str, *str_len, "\"%s\"", name[i]);
if(!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
goto out;
- sprintf(tmp_str, "%*s ", MAX(0, 16 - nchars), "");
+ snprintf(tmp_str, *str_len, "%*s ", MAX(0, 16 - nchars), "");
if(!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
goto out;
@@ -1775,13 +1775,13 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, int indt)
*strangely, unless use another pointer "copy".*/
copy = value+i*dst_size;
if (H5T_SGN_NONE == H5Tget_sign(native))
- sprintf(tmp_str,"%u", *((unsigned int*)((void *)copy)));
+ snprintf(tmp_str, *str_len, "%u", *((unsigned int*)((void *)copy)));
else
- sprintf(tmp_str,"%d", *((int*)((void *)copy)));
+ snprintf(tmp_str, *str_len, "%d", *((int*)((void *)copy)));
if(!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
goto out;
- sprintf(tmp_str, ";\n");
+ snprintf(tmp_str, *str_len, ";\n");
if(!(str = realloc_and_append(no_ubuf, str_len, str, tmp_str)))
goto out;
}
@@ -1799,7 +1799,7 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, int indt)
out:
if(0 == nmembs) {
- sprintf(tmp_str, "\n%*s <empty>", indt + 4, "");
+ snprintf(tmp_str, *str_len, "\n%*s <empty>", indt + 4, "");
str = realloc_and_append(no_ubuf, str_len, str, tmp_str);
} /* end if */
@@ -1889,14 +1889,13 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
{
H5T_class_t tcls;
char tmp_str[256];
- char *tmp = NULL;
int i;
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, NULL)))
goto out;
if(lang != H5LT_DDL) {
- sprintf(dt_str, "only DDL is supported for now");
+ snprintf(dt_str, *slen, "only DDL is supported for now");
goto out;
}
@@ -1906,81 +1905,81 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
switch (tcls) {
case H5T_INTEGER:
if (H5Tequal(dtype, H5T_STD_I8BE)) {
- sprintf(dt_str, "H5T_STD_I8BE");
+ snprintf(dt_str, *slen, "H5T_STD_I8BE");
} else if (H5Tequal(dtype, H5T_STD_I8LE)) {
- sprintf(dt_str, "H5T_STD_I8LE");
+ snprintf(dt_str, *slen, "H5T_STD_I8LE");
} else if (H5Tequal(dtype, H5T_STD_I16BE)) {
- sprintf(dt_str, "H5T_STD_I16BE");
+ snprintf(dt_str, *slen, "H5T_STD_I16BE");
} else if (H5Tequal(dtype, H5T_STD_I16LE)) {
- sprintf(dt_str, "H5T_STD_I16LE");
+ snprintf(dt_str, *slen, "H5T_STD_I16LE");
} else if (H5Tequal(dtype, H5T_STD_I32BE)) {
- sprintf(dt_str, "H5T_STD_I32BE");
+ snprintf(dt_str, *slen, "H5T_STD_I32BE");
} else if (H5Tequal(dtype, H5T_STD_I32LE)) {
- sprintf(dt_str, "H5T_STD_I32LE");
+ snprintf(dt_str, *slen, "H5T_STD_I32LE");
} else if (H5Tequal(dtype, H5T_STD_I64BE)) {
- sprintf(dt_str, "H5T_STD_I64BE");
+ snprintf(dt_str, *slen, "H5T_STD_I64BE");
} else if (H5Tequal(dtype, H5T_STD_I64LE)) {
- sprintf(dt_str, "H5T_STD_I64LE");
+ snprintf(dt_str, *slen, "H5T_STD_I64LE");
} else if (H5Tequal(dtype, H5T_STD_U8BE)) {
- sprintf(dt_str, "H5T_STD_U8BE");
+ snprintf(dt_str, *slen, "H5T_STD_U8BE");
} else if (H5Tequal(dtype, H5T_STD_U8LE)) {
- sprintf(dt_str, "H5T_STD_U8LE");
+ snprintf(dt_str, *slen, "H5T_STD_U8LE");
} else if (H5Tequal(dtype, H5T_STD_U16BE)) {
- sprintf(dt_str, "H5T_STD_U16BE");
+ snprintf(dt_str, *slen, "H5T_STD_U16BE");
} else if (H5Tequal(dtype, H5T_STD_U16LE)) {
- sprintf(dt_str, "H5T_STD_U16LE");
+ snprintf(dt_str, *slen, "H5T_STD_U16LE");
} else if (H5Tequal(dtype, H5T_STD_U32BE)) {
- sprintf(dt_str, "H5T_STD_U32BE");
+ snprintf(dt_str, *slen, "H5T_STD_U32BE");
} else if (H5Tequal(dtype, H5T_STD_U32LE)) {
- sprintf(dt_str, "H5T_STD_U32LE");
+ snprintf(dt_str, *slen, "H5T_STD_U32LE");
} else if (H5Tequal(dtype, H5T_STD_U64BE)) {
- sprintf(dt_str, "H5T_STD_U64BE");
+ snprintf(dt_str, *slen, "H5T_STD_U64BE");
} else if (H5Tequal(dtype, H5T_STD_U64LE)) {
- sprintf(dt_str, "H5T_STD_U64LE");
+ snprintf(dt_str, *slen, "H5T_STD_U64LE");
} else if (H5Tequal(dtype, H5T_NATIVE_SCHAR)) {
- sprintf(dt_str, "H5T_NATIVE_SCHAR");
+ snprintf(dt_str, *slen, "H5T_NATIVE_SCHAR");
} else if (H5Tequal(dtype, H5T_NATIVE_UCHAR)) {
- sprintf(dt_str, "H5T_NATIVE_UCHAR");
+ snprintf(dt_str, *slen, "H5T_NATIVE_UCHAR");
} else if (H5Tequal(dtype, H5T_NATIVE_SHORT)) {
- sprintf(dt_str, "H5T_NATIVE_SHORT");
+ snprintf(dt_str, *slen, "H5T_NATIVE_SHORT");
} else if (H5Tequal(dtype, H5T_NATIVE_USHORT)) {
- sprintf(dt_str, "H5T_NATIVE_USHORT");
+ snprintf(dt_str, *slen, "H5T_NATIVE_USHORT");
} else if (H5Tequal(dtype, H5T_NATIVE_INT)) {
- sprintf(dt_str, "H5T_NATIVE_INT");
+ snprintf(dt_str, *slen, "H5T_NATIVE_INT");
} else if (H5Tequal(dtype, H5T_NATIVE_UINT)) {
- sprintf(dt_str, "H5T_NATIVE_UINT");
+ snprintf(dt_str, *slen, "H5T_NATIVE_UINT");
} else if (H5Tequal(dtype, H5T_NATIVE_LONG)) {
- sprintf(dt_str, "H5T_NATIVE_LONG");
+ snprintf(dt_str, *slen, "H5T_NATIVE_LONG");
} else if (H5Tequal(dtype, H5T_NATIVE_ULONG)) {
- sprintf(dt_str, "H5T_NATIVE_ULONG");
+ snprintf(dt_str, *slen, "H5T_NATIVE_ULONG");
} else if (H5Tequal(dtype, H5T_NATIVE_LLONG)) {
- sprintf(dt_str, "H5T_NATIVE_LLONG");
+ snprintf(dt_str, *slen, "H5T_NATIVE_LLONG");
} else if (H5Tequal(dtype, H5T_NATIVE_ULLONG)) {
- sprintf(dt_str, "H5T_NATIVE_ULLONG");
+ snprintf(dt_str, *slen, "H5T_NATIVE_ULLONG");
} else {
- sprintf(dt_str, "undefined integer");
+ snprintf(dt_str, *slen, "undefined integer");
}
break;
case H5T_FLOAT:
if (H5Tequal(dtype, H5T_IEEE_F32BE)) {
- sprintf(dt_str, "H5T_IEEE_F32BE");
+ snprintf(dt_str, *slen, "H5T_IEEE_F32BE");
} else if (H5Tequal(dtype, H5T_IEEE_F32LE)) {
- sprintf(dt_str, "H5T_IEEE_F32LE");
+ snprintf(dt_str, *slen, "H5T_IEEE_F32LE");
} else if (H5Tequal(dtype, H5T_IEEE_F64BE)) {
- sprintf(dt_str, "H5T_IEEE_F64BE");
+ snprintf(dt_str, *slen, "H5T_IEEE_F64BE");
} else if (H5Tequal(dtype, H5T_IEEE_F64LE)) {
- sprintf(dt_str, "H5T_IEEE_F64LE");
+ snprintf(dt_str, *slen, "H5T_IEEE_F64LE");
} else if (H5Tequal(dtype, H5T_NATIVE_FLOAT)) {
- sprintf(dt_str, "H5T_NATIVE_FLOAT");
+ snprintf(dt_str, *slen, "H5T_NATIVE_FLOAT");
} else if (H5Tequal(dtype, H5T_NATIVE_DOUBLE)) {
- sprintf(dt_str, "H5T_NATIVE_DOUBLE");
+ snprintf(dt_str, *slen, "H5T_NATIVE_DOUBLE");
#if H5_SIZEOF_LONG_DOUBLE !=0
} else if (H5Tequal(dtype, H5T_NATIVE_LDOUBLE)) {
- sprintf(dt_str, "H5T_NATIVE_LDOUBLE");
+ snprintf(dt_str, *slen, "H5T_NATIVE_LDOUBLE");
#endif
} else {
- sprintf(dt_str, "undefined float");
+ snprintf(dt_str, *slen, "undefined float");
}
break;
@@ -2009,16 +2008,16 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
goto out;
/* Print lead-in */
- sprintf(dt_str, "H5T_STRING {\n");
+ snprintf(dt_str, *slen, "H5T_STRING {\n");
indent += COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
if(is_vlstr)
- sprintf(tmp_str, "STRSIZE H5T_VARIABLE;\n");
+ snprintf(tmp_str, *slen, "STRSIZE H5T_VARIABLE;\n");
else
- sprintf(tmp_str, "STRSIZE %d;\n", (int)size);
+ snprintf(tmp_str, *slen, "STRSIZE %d;\n", (int)size);
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2027,13 +2026,13 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
goto out;
if (str_pad == H5T_STR_NULLTERM)
- sprintf(tmp_str, "STRPAD H5T_STR_NULLTERM;\n");
+ snprintf(tmp_str, *slen, "STRPAD H5T_STR_NULLTERM;\n");
else if (str_pad == H5T_STR_NULLPAD)
- sprintf(tmp_str, "STRPAD H5T_STR_NULLPAD;\n");
+ snprintf(tmp_str, *slen, "STRPAD H5T_STR_NULLPAD;\n");
else if (str_pad == H5T_STR_SPACEPAD)
- sprintf(tmp_str, "STRPAD H5T_STR_SPACEPAD;\n");
+ snprintf(tmp_str, *slen, "STRPAD H5T_STR_SPACEPAD;\n");
else
- sprintf(tmp_str, "STRPAD H5T_STR_ERROR;\n");
+ snprintf(tmp_str, *slen, "STRPAD H5T_STR_ERROR;\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2042,11 +2041,11 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
goto out;
if (cset == H5T_CSET_ASCII)
- sprintf(tmp_str, "CSET H5T_CSET_ASCII;\n");
+ snprintf(tmp_str, *slen, "CSET H5T_CSET_ASCII;\n");
else if (cset == H5T_CSET_UTF8)
- sprintf(tmp_str, "CSET H5T_CSET_UTF8;\n");
+ snprintf(tmp_str, *slen, "CSET H5T_CSET_UTF8;\n");
else
- sprintf(tmp_str, "CSET unknown;\n");
+ snprintf(tmp_str, *slen, "CSET unknown;\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2071,7 +2070,7 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
/* Check C variable-length string first. Are the two types equal? */
if (H5Tequal(tmp_type, str_type)) {
- sprintf(tmp_str, "CTYPE H5T_C_S1;\n");
+ snprintf(tmp_str, *slen, "CTYPE H5T_C_S1;\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
goto next;
@@ -2089,7 +2088,7 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
}
if (H5Tequal(tmp_type, str_type)) {
- sprintf(tmp_str, "CTYPE H5T_C_S1;\n");
+ snprintf(tmp_str, *slen, "CTYPE H5T_C_S1;\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
goto next;
@@ -2110,7 +2109,7 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
/* Are the two types equal? */
if (H5Tequal(tmp_type, str_type)) {
- sprintf(tmp_str, "CTYPE H5T_FORTRAN_S1;\n");
+ snprintf(tmp_str, *slen, "CTYPE H5T_FORTRAN_S1;\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
goto next;
@@ -2129,14 +2128,14 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
/* Are the two types equal? */
if (H5Tequal(tmp_type, str_type)) {
- sprintf(tmp_str, "CTYPE H5T_FORTRAN_S1;\n");
+ snprintf(tmp_str, *slen, "CTYPE H5T_FORTRAN_S1;\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
goto next;
}
/* Type doesn't match any of above. */
- sprintf(tmp_str, "CTYPE unknown_one_character_type;\n");
+ snprintf(tmp_str, *slen, "CTYPE unknown_one_character_type;\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2148,7 +2147,7 @@ next:
indent -= COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
- sprintf(tmp_str, "}");
+ snprintf(tmp_str, *slen, "}");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2159,12 +2158,12 @@ next:
char *tag = NULL;
/* Print lead-in */
- sprintf(dt_str, "H5T_OPAQUE {\n");
+ snprintf(dt_str, *slen, "H5T_OPAQUE {\n");
indent += COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
- sprintf(tmp_str, "OPQ_SIZE %lu;\n", (unsigned long)H5Tget_size(dtype));
+ snprintf(tmp_str, *slen, "OPQ_SIZE %lu;\n", (unsigned long)H5Tget_size(dtype));
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2172,12 +2171,12 @@ next:
goto out;
tag = H5Tget_tag(dtype);
if(tag) {
- sprintf(tmp_str, "OPQ_TAG \"%s\";\n", tag);
+ snprintf(tmp_str, *slen, "OPQ_TAG \"%s\";\n", tag);
if(tag)
free(tag);
tag = NULL;
} else
- sprintf(tmp_str, "OPQ_TAG \"\";\n");
+ snprintf(tmp_str, *slen, "OPQ_TAG \"\";\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2185,7 +2184,7 @@ next:
indent -= COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
- sprintf(tmp_str, "}");
+ snprintf(tmp_str, *slen, "}");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2198,7 +2197,7 @@ next:
char* stmp = NULL;
/* Print lead-in */
- sprintf(dt_str, "H5T_ENUM {\n");
+ snprintf(dt_str, *slen, "H5T_ENUM {\n");
indent += COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
@@ -2217,7 +2216,7 @@ next:
free(stmp);
stmp = NULL;
- sprintf(tmp_str, ";\n");
+ snprintf(tmp_str, *slen, ";\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
H5Tclose(super);
@@ -2229,7 +2228,7 @@ next:
indent -= COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
- sprintf(tmp_str, "}");
+ snprintf(tmp_str, *slen, "}");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2242,7 +2241,7 @@ next:
char* stmp = NULL;
/* Print lead-in */
- sprintf(dt_str, "H5T_VLEN {\n");
+ snprintf(dt_str, *slen, "H5T_VLEN {\n");
indent += COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
@@ -2260,7 +2259,7 @@ next:
if(stmp)
free(stmp);
stmp = NULL;
- sprintf(tmp_str, "\n");
+ snprintf(tmp_str, *slen, "\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
H5Tclose(super);
@@ -2269,7 +2268,7 @@ next:
indent -= COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
- sprintf(tmp_str, "}");
+ snprintf(tmp_str, *slen, "}");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2284,7 +2283,7 @@ next:
int ndims;
/* Print lead-in */
- sprintf(dt_str, "H5T_ARRAY {\n");
+ snprintf(dt_str, *slen, "H5T_ARRAY {\n");
indent += COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
@@ -2297,11 +2296,11 @@ next:
/* Print array dimensions */
for (i = 0; i < ndims; i++) {
- sprintf(tmp_str, "[%d]", (int) dims[i]);
+ snprintf(tmp_str, *slen, "[%d]", (int) dims[i]);
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
}
- sprintf(tmp_str, " ");
+ snprintf(tmp_str, *slen, " ");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2317,7 +2316,7 @@ next:
if(stmp)
free(stmp);
stmp = NULL;
- sprintf(tmp_str, "\n");
+ snprintf(tmp_str, *slen, "\n");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
H5Tclose(super);
@@ -2326,7 +2325,7 @@ next:
indent -= COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
- sprintf(tmp_str, "}");
+ snprintf(tmp_str, *slen, "}");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
@@ -2345,7 +2344,7 @@ next:
if((nmembs = H5Tget_nmembers(dtype)) < 0)
goto out;
- sprintf(dt_str, "H5T_COMPOUND {\n");
+ snprintf(dt_str, *slen, "H5T_COMPOUND {\n");
indent += COL;
for (i = 0; i < nmembs; i++) {
@@ -2376,14 +2375,14 @@ next:
if (H5T_COMPOUND == mclass)
indent -= COL;
- sprintf(tmp_str, " \"%s\"", mname);
+ snprintf(tmp_str, *slen, " \"%s\"", mname);
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
if(mname)
free(mname);
mname = NULL;
- sprintf(tmp_str, " : %lu;\n", (unsigned long)moffset);
+ snprintf(tmp_str, *slen, " : %lu;\n", (unsigned long)moffset);
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
}
@@ -2392,20 +2391,20 @@ next:
indent -= COL;
if(!(dt_str = indentation(indent + COL, dt_str, no_user_buf, slen)))
goto out;
- sprintf(tmp_str, "}");
+ snprintf(tmp_str, *slen, "}");
if(!(dt_str = realloc_and_append(no_user_buf, slen, dt_str, tmp_str)))
goto out;
break;
}
case H5T_TIME:
- sprintf(dt_str, "H5T_TIME: not yet implemented");
+ snprintf(dt_str, *slen, "H5T_TIME: not yet implemented");
break;
case H5T_BITFIELD:
- sprintf(dt_str, "H5T_BITFIELD: not yet implemented");
+ snprintf(dt_str, *slen, "H5T_BITFIELD: not yet implemented");
break;
default:
- sprintf(dt_str, "unknown data type");
+ snprintf(dt_str, *slen, "unknown data type");
}
return dt_str;