compilation

Author: sfomel

trip/iwave/base/lib/parser.cc

@@ -908,23 +908,23 @@ int ps_set(PARARRAY * par, int last, const char * type, const char * key, const
     else {
 	if (!err && !strcmp(type,"char")) {
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%c",*((char *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%c",*((char *)val));
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
 	    }
 	    else err=0;
 	}
 	else if (!err && !strcmp(type,"long")) {
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%ld",*((long *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%ld",*((long *)val));
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
 	    }
 	    else err=0;
 	}
 	else if (!err && !strcmp(type,"ulong")) {
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%lu",*((unsigned long *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%lu",*((unsigned long *)val));
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
 	    }
@@ -933,7 +933,7 @@ int ps_set(PARARRAY * par, int last, const char * type, const char * key, const
 	else if (!err && !strcmp(type,"int")) {
 	    /*      fprintf(stderr,"in ps_set - int\n"); */
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%d",*((int *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%d",*((int *)val));
 	    /*      fprintf(stderr,"output = %s err=%d\n",l,err); */
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
@@ -942,39 +942,39 @@ int ps_set(PARARRAY * par, int last, const char * type, const char * key, const
 	}
 	else if (!err && !strcmp(type,"uint")) {
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%u",*((unsigned int *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%u",*((unsigned int *)val));
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
 	    }
 	    else err=0;
 	}
 	else if (!err && !strcmp(type,"short")) {
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%hd",*((short *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%hd",*((short *)val));
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
 	    }
 	    else err=0;
 	}
 	else if (!err && !strcmp(type,"ushort")) {
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%hu",*((unsigned short *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%hu",*((unsigned short *)val));
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
 	    }
 	    else err=0;
 	}    
 	else if (!err && !strcmp(type,"float")) {
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%g",*((float *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%g",*((float *)val));
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
 	    }
 	    else err=0;
 	}
 	else if (!err && !strcmp(type,"double")) {
 	    memset(l,'\0',MAX_STR_LEN);
-	    err=sprintf(l,"%g",*((double *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%g",*((double *)val));
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;
 	    }
@@ -983,9 +983,9 @@ int ps_set(PARARRAY * par, int last, const char * type, const char * key, const
 	else if (!err && !strcmp(type,"ireal")) {
 	    memset(l,'\0',MAX_STR_LEN);
 #if DT_REAL == DT_DOUBLE
-	    err=sprintf(l,"%g",*((double *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%g",*((double *)val));
 #else
-	    err=sprintf(l,"%g",*((float *)val));
+	    err=snprintf(l, MAX_STR_LEN, "%g",*((float *)val));
 #endif
 	    if (0==err || MAX_STR_LEN==err) {
 		err=E_PARSECONVERT;

trip/rvl/rvl/include/except.hh

@@ -63,37 +63,37 @@ namespace RVL {
     }
     RVLException & operator<< ( int i ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "%d", i );
+      snprintf( buf, BUFLEN, "%d", i );
       msg += buf;
       return *this;
     }
     RVLException & operator<< ( unsigned int i ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "%u", i );
+      snprintf( buf, BUFLEN, "%u", i );
       msg += buf;
       return *this;
     }
     RVLException & operator<< ( long i ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "%ld", i );
+      snprintf( buf, BUFLEN, "%ld", i );
       msg += buf;
       return *this;
     }
     RVLException & operator<< ( unsigned long i ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "%lu", i );
+      snprintf( buf, BUFLEN, "%lu", i );
       msg += buf;
       return *this;
     }
     RVLException & operator<< ( short i ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "%d", i );
+      snprintf( buf, BUFLEN, "%d", i );
       msg += buf;
       return *this;
     }
     RVLException & operator<< ( unsigned short i ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "%d", i );
+      snprintf( buf, BUFLEN, "%d", i );
       msg += buf;
       return *this;
     }
@@ -107,20 +107,20 @@ namespace RVL {
     */
     RVLException & operator<< ( double d ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "%g", d );
+      snprintf( buf, BUFLEN, "%g", d );
       msg += buf;
       return *this;
     }
     RVLException & operator<< ( float d ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "%g", d );
+      snprintf( buf, BUFLEN, "%g", d );
       msg += buf;
       return *this;
     }
     template<class T>
     RVLException & operator<< ( complex<T> d ) {
       char buf[ BUFLEN ];
-      sprintf( buf, "(%g,%g)", d.real(),d.imag() );
+      snprintf( buf, BUFLEN, "(%g,%g)", d.real(),d.imag() );
       msg += buf;
       return *this;
     }