Index: /branches/eam_rel9_b1/psLib/src/math/psPolynomial.c =================================================================== --- /branches/eam_rel9_b1/psLib/src/math/psPolynomial.c (revision 6026) +++ /branches/eam_rel9_b1/psLib/src/math/psPolynomial.c (revision 6027) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * -* @version $Revision: 1.133 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-30 02:00:09 $ +* @version $Revision: 1.133.6.1 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-17 09:22:39 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1031,3 +1031,2 @@ return(tmp); } - Index: /branches/eam_rel9_b1/psLib/src/math/psPolynomial.h =================================================================== --- /branches/eam_rel9_b1/psLib/src/math/psPolynomial.h (revision 6026) +++ /branches/eam_rel9_b1/psLib/src/math/psPolynomial.h (revision 6027) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-12 21:02:20 $ + * @version $Revision: 1.58.16.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-17 09:22:39 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii Index: /branches/eam_rel9_b1/psLib/src/sys/psConfigure.c =================================================================== --- /branches/eam_rel9_b1/psLib/src/sys/psConfigure.c (revision 6026) +++ /branches/eam_rel9_b1/psLib/src/sys/psConfigure.c (revision 6027) @@ -13,6 +13,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12.6.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-12-24 00:00:22 $ + * @version $Revision: 1.12.6.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-17 09:24:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii Index: /branches/eam_rel9_b1/psLib/src/types/psMetadataConfig.c =================================================================== --- /branches/eam_rel9_b1/psLib/src/types/psMetadataConfig.c (revision 6026) +++ /branches/eam_rel9_b1/psLib/src/types/psMetadataConfig.c (revision 6027) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.48.16.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-12-23 02:04:42 $ +* @version $Revision: 1.48.16.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-17 09:25:15 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1225,213 +1225,133 @@ PS_ASSERT_PTR_NON_NULL(md, NULL); - psString newString = NULL; - psString newStr = NULL; - char mdString[16000]; + psString mdString = NULL; + psString content = NULL; + psMetadataItem *item = NULL; psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL); - psDataType type = PS_DATA_UNKNOWN; - // int size = 0; - int i = 0; - char content[MAXSTR]; - char buffer[MAXSTR]; - char *buffer2; - strcpy(content, "\0"); - strcpy(mdString, "\0"); while ( (item = psMetadataGetAndIncrement(iter)) ) { - type = item->type; - if ( type == PS_DATA_STRING) { - type = PS_DATA_STRING; - } - if ( type == PS_DATA_VECTOR) { - type = PS_DATA_VECTOR; - } - if ( type == PS_DATA_TIME) { - type = PS_DATA_TIME; - } - if ( item->type == PS_DATA_METADATA) { - type = PS_DATA_METADATA; - } if (item == NULL) { - type = PS_DATA_UNKNOWN; - } - - switch (type) { + // XXX : this is probably not the right error value + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, PS_DATA_UNKNOWN); + psFree(iter); + return NULL; + } + + // In this block, the single item is used to build 'content' + switch (item->type) { case PS_DATA_BOOL: - // size = strlen(item->name); - snprintf(content, MAXSTR, "%s BOOL ", item->name); - strncat(mdString, content, MAXSTR); - if ( item->data.B ) - strncat(mdString, "TRUE", MAXSTR); - else - strncat(mdString, "FALSE", MAXSTR); + psStringAppend (&content, "%s BOOL ", item->name); + if ( item->data.B ) { + psStringAppend(&content, "TRUE"); + } else { + psStringAppend(&content, "FALSE"); + } if ( item->comment != NULL ) { - // size = strlen(item->comment); - snprintf(content, MAXSTR, " #%s \n", item->comment); - strncat(mdString, content, MAXSTR); + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n", item->comment); + break; + case PS_DATA_S32: + psStringAppend(&content, "%s S32 ", item->name); + psStringAppend(&content, "%d ", item->data.S32); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_F32: + psStringAppend(&content, "%s F32 ", item->name); + psStringAppend(&content, "%22.15g ", item->data.F32); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_F64: + psStringAppend(&content, "%s F64 ", item->name); + psStringAppend(&content, "%22.15g ", item->data.F64); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_STRING: + psStringAppend(&content, "%s STR ", item->name); + psStringAppend(&content, "%s ", ((char *)(item->data.V))); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_METADATA: + psStringAppend(&content, "\n%s METADATA ", item->name); + psString newStr = psMetadataConfigFormat(item->data.md); + // XXX need to check for NULL return value, implying error + // from a lower level + + // add 3 extra spaces to each metadata folder item + char *buffer2 = strtok(newStr, "\n"); + while( buffer2 != NULL ) { + psStringAppend(&content, "\n %s", buffer2); + buffer2 = strtok(NULL, "\n"); + } + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, "\nEND #%s\n\n", item->comment); } else { - snprintf(content, MAXSTR, "\n"); - strncat(mdString, content, MAXSTR); - } - break; - case PS_DATA_S32: - // size = strlen(item->name); - snprintf(content, MAXSTR, "%s S32 ", item->name); - strncat(mdString, content, MAXSTR); - snprintf(content, MAXSTR, "%d ", item->data.S32); - strncat(mdString, content, MAXSTR); - if ( strncmp(item->comment,"",2) ) { - // size = strlen(item->comment); - snprintf(content, MAXSTR, " #%s \n", item->comment); - strncat(mdString, content, MAXSTR); - } else { - snprintf(content, MAXSTR, "\n"); - strncat(mdString, content, MAXSTR); - } - break; - case PS_DATA_F32: - // size = strlen(item->name); - snprintf(content, MAXSTR, "%s F32 ", item->name); - strncat(mdString, content, MAXSTR); - snprintf(content, MAXSTR, "%22.15g ", item->data.F32); - strncat(mdString, content, MAXSTR); - if ( strncmp(item->comment,"",2) ) { - // if ( item->comment != NULL ) { - // size = strlen(item->comment); - snprintf(content, MAXSTR, " #%s \n", item->comment); - strncat(mdString, content, MAXSTR); - } else { - snprintf(content, MAXSTR, "\n"); - strncat(mdString, content, MAXSTR); - } - break; - case PS_DATA_F64: - // size = strlen(item->name); - snprintf(content, MAXSTR, "%s F64 ", item->name); - strncat(mdString, content, MAXSTR); - snprintf(content, MAXSTR, "%22.15g ", item->data.F64); - strncat(mdString, content, MAXSTR); - if ( strncmp(item->comment,"",2) ) { - // if ( item->comment != NULL ) { - // if ( !strncmp((char*)item->comment, "", 2) ) { - // size = strlen(item->comment); - snprintf(content, MAXSTR, " #%s \n", item->comment); - strncat(mdString, content, MAXSTR); - } else { - snprintf(content, MAXSTR, "\n"); - strncat(mdString, content, MAXSTR); - } - break; - case PS_DATA_STRING: - // size = strlen(item->name); - snprintf(content, MAXSTR, "%s STR ", item->name); - strncat(mdString, content, MAXSTR); - // size = strlen(((char *)(item->data.V))); - snprintf(content, MAXSTR, "%s ", ((char *)(item->data.V))); - strncat(mdString, content, MAXSTR); - if ( strncmp(item->comment,"",2) ) { - // if ( item->comment != NULL ) { - // size = strlen(item->comment); - snprintf(content, MAXSTR, " #%s \n", item->comment); - strncat(mdString, content, MAXSTR); - } else { - snprintf(content, MAXSTR, "\n"); - strncat(mdString, content, MAXSTR); - } - break; - case PS_DATA_METADATA: - snprintf(content, MAXSTR, "\n%s METADATA ", item->name); - strncat(mdString, content, MAXSTR); - - newStr = psMetadataConfigFormat(item->data.md); - strncpy(buffer, (char *)newStr, MAXSTR); - buffer2 = strtok(buffer, "\n"); - while( buffer2 != NULL ) { - snprintf(content, MAXSTR, "\n %s", buffer2); - strncat(mdString, content, MAXSTR); - buffer2 = strtok(NULL, "\n"); - } - if ( strncmp(item->comment,"",2) ) { - // if ( item->comment != NULL ) { - snprintf(content, MAXSTR, "\nEND #%s\n\n", item->comment); - strncat(mdString, content, MAXSTR); - } else { - snprintf(content, MAXSTR, "\nEND\n\n"); - strncat(mdString, content, MAXSTR); + psStringAppend(&content, "\nEND\n\n"); } psFree(newStr); break; case PS_DATA_TIME: - snprintf(content, MAXSTR, "%s ", item->name); - if ( ((psTime*)(item->data.V))->type == PS_TIME_UTC ) - strncat(content, "PS_TIME_UTC ", MAXSTR); - else if ( ((psTime*)(item->data.V))->type == PS_TIME_TAI ) - strncat(content, "PS_TIME_TAI ", MAXSTR); - else if ( ((psTime*)(item->data.V))->type == PS_TIME_UT1 ) - strncat(content, "PS_TIME_UT1 ", MAXSTR); - else if ( ((psTime*)(item->data.V))->type == PS_TIME_TT ) - strncat(content, "PS_TIME_TT ", MAXSTR); + psStringAppend(&content, "%s ", item->name); + psTime *time = item->data.V; + if ( time->type == PS_TIME_UTC ) + psStringAppend(&content, "PS_TIME_UTC "); + else if ( time->type == PS_TIME_TAI ) + psStringAppend(&content, "PS_TIME_TAI "); + else if ( time->type == PS_TIME_UT1 ) + psStringAppend(&content, "PS_TIME_UT1 "); + else if ( time->type == PS_TIME_TT ) + psStringAppend(&content, "PS_TIME_TT "); else { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, type); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, time->type); + // XXX memory leak: should free content and mdString before returning psFree(iter); return NULL; } - strncat(mdString, content, MAXSTR); - - snprintf(content, MAXSTR, "%ld, ", (long)((psTime*)(item->data.V))->sec); - strncat(mdString, content, MAXSTR); - snprintf(content, MAXSTR, "%u, ", ((psTime*)(item->data.V))->nsec); - strncat(mdString, content, MAXSTR); - if ( ((psTime*)(item->data.V))->leapsecond ) - strncat(mdString, "T ", MAXSTR); + + psStringAppend(&content, "%ld, ", (long)time->sec); + psStringAppend(&content, "%u, ", time->nsec); + if ( time->leapsecond ) + psStringAppend(&content, "T "); else - strncat(mdString, "F ", MAXSTR); + psStringAppend(&content, "F "); if ( strncmp(item->comment,"",2) ) { - // if ( item->comment != NULL ) { - snprintf(content, MAXSTR, " #%s \n", item->comment); - strncat(mdString, content, MAXSTR); - } else { - snprintf(content, MAXSTR, "\n"); - strncat(mdString, content, MAXSTR); - } + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); break; case PS_DATA_VECTOR: - // size = strlen(item->name); - snprintf(content, MAXSTR, "@%s ", item->name); - strncat(mdString, content, MAXSTR); - type = ((psVector*)(item->data.V))->type.type; - switch (type) { + psStringAppend(&content, "@%s ", item->name); + psVector *vector = item->data.V; + + switch (vector->type.type) { case PS_DATA_S32: - strncat(mdString, "S32 ", MAXSTR); - for (i = 0; ((psVector*)(item->data.V))->data.S32[i] != 0; i++) { - snprintf(content, MAXSTR, "%d", - ((psVector*)(item->data.V))->data.S32[i]); - if ( ((psVector*)(item->data.V))->data.S32[i+1] != 0 ) { - strncat(content, ", ", MAXSTR); - } - strncat(mdString, content, MAXSTR); + psStringAppend(&content, "S32 "); + for (int i = 0; i < vector->n; i++) { + psStringAppend(&content, "%d ", vector->data.S32[i]); } break; case PS_DATA_F32: - strncat(mdString, "F32 ", MAXSTR); - for (i = 0; ((psVector*)(item->data.V))->data.F32[i] != 0; i++) { - snprintf(content, MAXSTR, "%f", - ((psVector*)(item->data.V))->data.F32[i]); - if ( ((psVector*)(item->data.V))->data.F32[i+1] != 0 ) { - strncat(content, ", ", MAXSTR); - } - strncat(mdString, content, MAXSTR); + psStringAppend(&content, "F32 ", MAXSTR); + for (int i = 0; i < vector->n; i++) { + psStringAppend(&content, "%f ", vector->data.F32[i]); } break; case PS_DATA_F64: - strncat(mdString, "F64 ", MAXSTR); - for (i = 0; ((psVector*)(item->data.V))->data.F64[i] != 0; i++) { - snprintf(content, MAXSTR, "%lf", - ((psVector*)(item->data.V))->data.F64[i]); - if ( ((psVector*)(item->data.V))->data.F64[i+1] != 0 ) { - strncat(content, ", ", MAXSTR); - } - strncat(mdString, content, MAXSTR); + psStringAppend(&content, "F64 ", MAXSTR); + for (int i = 0; i < vector->n; i++) { + psStringAppend(&content, "%lf", vector->data.F64[i]); } break; @@ -1439,29 +1359,28 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, type); + PS_ERRORTEXT_psMetadata_METATYPE_INVALID, vector->type.type); psFree(iter); + // XXX memory leak: should free content and mdString before returning return NULL; } if ( strncmp(item->comment,"",2) ) { - // if ( item->comment != NULL ) { - // size = strlen(item->comment); - snprintf(content, MAXSTR, " #%s \n", item->comment); - strncat(mdString, content, MAXSTR); - } else { - snprintf(content, MAXSTR, "\n"); - strncat(mdString, content, MAXSTR); - } + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); break; case PS_DATA_UNKNOWN: default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, type); + PS_ERRORTEXT_psMetadata_METATYPE_INVALID, item->type); psFree(iter); + // XXX memory leak: should free content and mdString before returning return NULL; } - } - newString = psStringNCopy(mdString, 16000); + psStringAppend(&mdString, content); + psFree(content); + content = NULL; + } psFree(iter); - return newString; + return mdString; }