Merge branch 'master' of https://github.com/ahay/src

sfomel · sfomel · commit b6b2e3149f49 · 2025-08-07T17:16:07.000-05:00
diff --git a/system/generic/predicates.c b/system/generic/predicates.c
@@ -495,7 +495,7 @@ REAL *e;
 /*                                                                           */
 /*****************************************************************************/
 
-double doublerand()
+double doublerand(void)
 {
   double result;
   double expo;
@@ -521,7 +521,7 @@ double doublerand()
 /*                                                                           */
 /*****************************************************************************/
 
-double narrowdoublerand()
+double narrowdoublerand(void)
 {
   double result;
   double expo;
@@ -546,7 +546,7 @@ double narrowdoublerand()
 /*                                                                           */
 /*****************************************************************************/
 
-double uniformdoublerand()
+double uniformdoublerand(void)
 {
   double result;
   long a, b;
@@ -564,7 +564,7 @@ double uniformdoublerand()
 /*                                                                           */
 /*****************************************************************************/
 
-float floatrand()
+float floatrand(void)
 {
   float result;
   float expo;
@@ -589,7 +589,7 @@ float floatrand()
 /*                                                                           */
 /*****************************************************************************/
 
-float narrowfloatrand()
+float narrowfloatrand(void)
 {
   float result;
   float expo;
@@ -613,7 +613,7 @@ float narrowfloatrand()
 /*                                                                           */
 /*****************************************************************************/
 
-float uniformfloatrand()
+float uniformfloatrand(void)
 {
   float result;
   long a;
@@ -643,7 +643,7 @@ float uniformfloatrand()
 /*****************************************************************************/
 
 
-void exactinit()
+void exactinit(void)
 {
   REAL half;
   REAL check, lastcheck;
diff --git a/system/seismic/ctoeplitz.c b/system/seismic/ctoeplitz.c
@@ -106,7 +106,7 @@ void ctoeplitz_solve (const sf_complex *r /* top row of the matrix */,
     }
 }
 
-void ctoeplitz_close()
+void ctoeplitz_close(void)
 /*< free allocated storage >*/
 {
     free (a);
diff --git a/system/seismic/fft2.c b/system/seismic/fft2.c
@@ -155,7 +155,7 @@ void sft2_init(float o1, float d1,
 }
 
 /*------------------------------------------------------------*/
-void sft2_close()
+void sft2_close(void)
 /*< close shift >*/
 {
     free(shf1);
diff --git a/system/seismic/img2.c b/system/seismic/img2.c
@@ -691,7 +691,7 @@ void img2x_close(sf_fslice imag,
 }
 
 /*------------------------------------------------------------*/
-void img2_close()
+void img2_close(void)
 /*< deallocate >*/
 {
     free(**qs); free(*qs); free(qs);
diff --git a/system/seismic/radon.c b/system/seismic/radon.c
@@ -37,7 +37,7 @@ void radon_init (int nx_in                            /* number of offsets */,
     czero = sf_cmplx(0.,0.);
 }
 
-void radon_close () 
+void radon_close (void) 
 /*< free allocated storage >*/
 {
     free (c0);
diff --git a/system/seismic/rweone.c b/system/seismic/rweone.c
@@ -559,7 +559,7 @@ void rweone_thr(
     }
 }
 
-void rweone_tap_init()
+void rweone_tap_init(void)
 /*< initialize taper >*/
 {
     int itap,jtap;
@@ -632,7 +632,7 @@ void rweone_fft(
 }
 
 
-void rweone_mrs_init()
+void rweone_mrs_init(void)
 /*< init MRS >*/
 {
     int ig;
diff --git a/trip/iwave/grid/main/standardmodel.cc b/trip/iwave/grid/main/standardmodel.cc
@@ -601,7 +601,7 @@ int main(int argc, char **argv) {
   /* DS */
   if (model == 10){
     for(i = 0; i< 4 ; i++){
-      sprintf(numlname,"m%d_numl",i+1);
+      snprintf(numlname,10,"m%d_numl",i+1);
       /* set up layer numbers for velocity, density, bulkmod and buoyancy */
       if (ps_ffint(*par,numlname,numl+i)) numl[i] = 1;
        
@@ -614,7 +614,7 @@ int main(int argc, char **argv) {
        
       for (j =0; j< numl[i]; j++){
 	if (j < numl[i]-1){
-	  sprintf(x1rsname,"m%d_rf%d",i+1,j+1);
+	  snprintf(x1rsname,10,"m%d_rf%d",i+1,j+1);
 	  if(ps_fffloat(*par,x1rsname,x1rs[i]+j)) 
 	    { x1rs[i][j] = e1; 
 	      fprintf(stdout, "WARNING: x1rs[%d][%d] is set to the default value %f!\n",i,j,e1);
@@ -623,7 +623,7 @@ int main(int argc, char **argv) {
 	    fprintf(stdout,"%s=%e\n",x1rsname,*(x1rs[i]+j));
 
 	}
-	sprintf(valname,"m%d_val%d",i+1,j+1);
+	snprintf(valname,10,"m%d_val%d",i+1,j+1);
 	if(ps_fffloat(*par,valname,values[i]+j)) 
 	  { values[i][j] = Vdefault[i]; 
 	    fprintf(stdout, "WARNING: values[%d][%d] is set to the default value %f!\n",i,j,Vdefault[i]);
diff --git a/trip/iwave/grid/main/standardmodel_elastic.cc b/trip/iwave/grid/main/standardmodel_elastic.cc
@@ -629,7 +629,7 @@ int main(int argc, char **argv) {
   /* DS */
   if (model == 10){
     for(i = 0; i< 4 ; i++){
-      sprintf(numlname,"m%d_numl",i+1);
+      snprintf(numlname,10,"m%d_numl",i+1);
       /* set up layer numbers for velocity, density, bulkmod and buoyancy */
       if (ps_ffint(*par,numlname,numl+i)) numl[i] = 1;
        
@@ -642,7 +642,7 @@ int main(int argc, char **argv) {
        
       for (j =0; j< numl[i]; j++){
 	if (j < numl[i]-1){
-	  sprintf(x1rsname,"m%d_rf%d",i+1,j+1);
+	  snprintf(x1rsname,10,"m%d_rf%d",i+1,j+1);
 	  if(ps_fffloat(*par,x1rsname,x1rs[i]+j)) 
 	    { x1rs[i][j] = e1; 
 	      fprintf(stderr, "WARNING: x1rs[%d][%d] is set to the default value %f!\n",i,j,e1);
@@ -651,7 +651,7 @@ int main(int argc, char **argv) {
 	    fprintf(stderr,"%s=%e\n",x1rsname,*(x1rs[i]+j));
 
 	}
-	sprintf(valname,"m%d_val%d",i+1,j+1);
+	snprintf(valname,10,"m%d_val%d",i+1,j+1);
 	if(ps_fffloat(*par,valname,values[i]+j)) 
 	  { values[i][j] = Vdefault[i]; 
 	    fprintf(stderr, "WARNING: values[%d][%d] is set to the default value %f!\n",i,j,Vdefault[i]);
diff --git a/user/chen/wavmod.c b/user/chen/wavmod.c
@@ -124,7 +124,7 @@ void wavmod_shot(sf_file dat, sf_file wfl, int ns, int *ps, float **ws)
 	sf_floatwrite(data[0], ntj*ng, dat);
 }
 
-void wavmod_close()
+void wavmod_close(void)
 /*< release memory >*/
 {
 	free(data[0]);
diff --git a/user/chengjb/Mtti2devectorlrsvd_double.cc b/user/chengjb/Mtti2devectorlrsvd_double.cc
@@ -664,12 +664,12 @@ int main(int argc, char* argv[])
             memset(datapznumber,0,10);
             memset(datasznumber,0,10);
 
-            sprintf(dataznumber,"dataz%d",it/1);
-            sprintf(dataxnumber,"datax%d",it/1);
-            sprintf(datapxnumber,"datapx%d",it/1);
-            sprintf(datasxnumber,"datasx%d",it/1);
-            sprintf(datapznumber,"datapz%d",it/1);
-            sprintf(datasznumber,"datasz%d",it/1);
+            snprintf(dataznumber,10,"dataz%d",it/1);
+            snprintf(dataxnumber,10,"datax%d",it/1);
+            snprintf(datapxnumber,10,"datapx%d",it/1);
+            snprintf(datasxnumber,10,"datasx%d",it/1);
+            snprintf(datapznumber,10,"datapz%d",it/1);
+            snprintf(datasznumber,10,"datasz%d",it/1);
 
             fp1 = fopen(dataxnumber,"wb");
             fp2 = fopen(dataznumber,"wb");
diff --git a/user/dirack/vfsacrsnh_lib.c b/user/dirack/vfsacrsnh_lib.c
@@ -38,7 +38,7 @@
 /*< Signal function >*/
 /*^*/
 
-float getRandomNumberBetween0and1(){
+float getRandomNumberBetween0and1(void){
 /*< Function to get a random number between 0 and 1 >*/
 
 	return (float)(rand()%1000)/1000;
diff --git a/user/harlan/Mtestcg.cc b/user/harlan/Mtestcg.cc
diff --git a/user/hpcss/Mrtm.c b/user/hpcss/Mrtm.c
diff --git a/user/hpcss/Mwave.c b/user/hpcss/Mwave.c
diff --git a/user/hpcss/Mwave24.c b/user/hpcss/Mwave24.c
diff --git a/user/lcasasan/mulchanfil.c b/user/lcasasan/mulchanfil.c

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ void ctoeplitz_solve (const sf_complex r / top row of the matrix */,`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`-void ctoeplitz_close()`
	`109`	`+void ctoeplitz_close(void)`
`110`	`110`	`/< free allocated storage >/`
`111`	`111`	`{`
`112`	`112`	`free (a);`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ void sft2_init(float o1, float d1,`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`/------------------------------------------------------------/`
`158`		`-void sft2_close()`
	`158`	`+void sft2_close(void)`
`159`	`159`	`/< close shift >/`
`160`	`160`	`{`
`161`	`161`	`free(shf1);`
Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,7 @@ void img2x_close(sf_fslice imag,`
`691`	`691`	`}`
`692`	`692`
`693`	`693`	`/------------------------------------------------------------/`
`694`		`-void img2_close()`
	`694`	`+void img2_close(void)`
`695`	`695`	`/< deallocate >/`
`696`	`696`	`{`
`697`	`697`	`free(*qs); free(qs); free(qs);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void radon_init (int nx_in /* number of offsets */,`
`37`	`37`	`czero = sf_cmplx(0.,0.);`
`38`	`38`	`}`
`39`	`39`
`40`		`-void radon_close ()`
	`40`	`+void radon_close (void)`
`41`	`41`	`/< free allocated storage >/`
`42`	`42`	`{`
`43`	`43`	`free (c0);`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ void rweone_thr(`
`559`	`559`	`}`
`560`	`560`	`}`
`561`	`561`
`562`		`-void rweone_tap_init()`
	`562`	`+void rweone_tap_init(void)`
`563`	`563`	`/< initialize taper >/`
`564`	`564`	`{`
`565`	`565`	`int itap,jtap;`
`@@ -632,7 +632,7 @@ void rweone_fft(`
`632`	`632`	`}`
`633`	`633`
`634`	`634`
`635`		`-void rweone_mrs_init()`
	`635`	`+void rweone_mrs_init(void)`
`636`	`636`	`/< init MRS >/`
`637`	`637`	`{`
`638`	`638`	`int ig;`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ void wavmod_shot(sf_file dat, sf_file wfl, int ns, int ps, float *ws)`
`124`	`124`	`sf_floatwrite(data[0], ntj*ng, dat);`
`125`	`125`	`}`
`126`	`126`
`127`		`-void wavmod_close()`
	`127`	`+void wavmod_close(void)`
`128`	`128`	`/< release memory >/`
`129`	`129`	`{`
`130`	`130`	`free(data[0]);`