removed some compiler warnings

slcs-jsc · May 23, 2019 · 2ea0349 · 2ea0349
1 parent 8efbe0f
commit 2ea0349
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/src/atmosphere.c b/src/atmosphere.c
@@ -35,33 +35,33 @@ size_t atm2x(ctl_t *ctl,
   if(ctl->retnn) {
     if(x!=NULL)
       gsl_vector_set(x, n, aero->nn[0]);
-      if(iqa!=NULL)
-	iqa[n]=IDXNN;
-      if(ipa!=NULL)
-	ipa[n]=-1;
-      (n)++;
+    if(iqa!=NULL)
+      iqa[n]=IDXNN;
+    if(ipa!=NULL)
+      ipa[n]=-1;
+    (n)++;
   }
 
   /* Add particle size... */
   if(ctl->retrr) {
     if(x!=NULL)
       gsl_vector_set(x, n, aero->rr[0]);
-      if(iqa!=NULL)
-	iqa[n]=IDXRR;
-      if(ipa!=NULL)
-	ipa[n]=-1;
-      (n)++;
+    if(iqa!=NULL)
+      iqa[n]=IDXRR;
+    if(ipa!=NULL)
+      ipa[n]=-1;
+    (n)++;
   }
 
   /* Add particle size distribution width... */
   if(ctl->retss) {
     if(x!=NULL)
       gsl_vector_set(x, n, aero->ss[0]);
-      if(iqa!=NULL)
-	iqa[n]=IDXSS;
-      if(ipa!=NULL)
-	ipa[n]=-1;
-      (n)++;
+    if(iqa!=NULL)
+      iqa[n]=IDXSS;
+    if(ipa!=NULL)
+      ipa[n]=-1;
+    (n)++;
   }
 
   return n;

diff --git a/src/control.c b/src/control.c
@@ -109,7 +109,7 @@ double scan_ctl(int argc,
   FILE *in=NULL;
 
   char dummy[LEN], fullname1[LEN], fullname2[LEN], line[LEN],
-    msg[LEN], rvarname[LEN], rval[LEN];
+    msg[2*LEN], rvarname[LEN], rval[LEN];
 
   int contain=0, i;
 

diff --git a/src/forwardmodel.c b/src/forwardmodel.c
@@ -507,7 +507,7 @@ void read_tbl(ctl_t *ctl,
 
   FILE *in;
 
-  char filename[LEN], line[LEN];
+  char filename[2*LEN], line[LEN];
 
   double eps, eps_old, press, press_old, temp, temp_old, u, u_old;
 
@@ -644,7 +644,7 @@ void srcfunc_planck(ctl_t *ctl,
 
   static int i, init=0, n, nplanck=1201;
 
-  char filename[LEN];
+  char filename[2*LEN];
 
   int id, it;
 

diff --git a/src/jurassic.h b/src/jurassic.h
@@ -45,7 +45,7 @@
 /* Print error message and quit program. */
 #define ERRMSG(msg) {                                                   \
     printf("\nError (%s, %s, l%d): %s\n\n",                             \
-           __FILE__, __FUNCTION__, __LINE__, msg);                      \
+           __FILE__, __func__, __LINE__, msg);                      \
     exit(EXIT_FAILURE);                                                 \
   }
 
@@ -86,7 +86,7 @@
 /* Print macro for debugging. */
 #define PRINT(format, var)                                              \
   printf("Print (%s, %s, l%d): %s= "format"\n",                         \
-         __FILE__, __FUNCTION__, __LINE__, #var, var);
+         __FILE__, __func__, __LINE__, #var, var);
 
 /* Read string tokens. */
 #define TOK(line, tok, format, var) {			\

diff --git a/src/misc.c b/src/misc.c
@@ -78,7 +78,7 @@ void init_tbl(ctl_t *ctl,
 
   FILE *in;
 
-  char filename[LEN], line[LEN];
+  char filename[2*LEN], line[LEN];
 
   double eps, eps_old, press, press_old, temp, temp_old, u, u_old,
     f[NSHAPE], fsum, nu[NSHAPE], tmin=100, tmax=400;

diff --git a/src/retrievalmodel.c b/src/retrievalmodel.c
@@ -422,7 +422,7 @@ void optimal_estimation(ret_t *ret,
 
   FILE *out;
 
-  char filename[LEN];
+  char filename[2*LEN];
 
   double chisq, chisq_old, disq=0, lmpar=0.001;
 

diff --git a/src/tab2bin.c b/src/tab2bin.c
@@ -9,7 +9,7 @@ int main(int argc, char *argv[]) {
 
   FILE *out;
 
-  char filename[LEN];
+  char filename[2*LEN];
 
   int id, ig, ip, it;