Renamed exprs_from_file() to exprsFromFile().

src/Exprf.cc

@@ -46,7 +46,7 @@ void grid_cell_area(int gridID, double *array);
 int getSurfaceID(int vlistID);
 
 static char *
-exprs_from_arg(const char *arg)
+exprsFromArgument(const char *arg)
 {
   size_t slen = strlen(arg);
   char *exprs = (char *) Malloc(slen + 2);
@@ -61,7 +61,7 @@ exprs_from_arg(const char *arg)
 }
 
 static char *
-exprs_from_file(const char *exprf)
+exprsFromFile(const char *exprf)
 {
   /* Open expr script file for reading */
   FILE *fp = fopen(exprf, "r");
@@ -86,7 +86,7 @@ exprs_from_file(const char *exprf)
 
 #define MAX_PARAMS 4096
 
-char *
+static char *
 str_replace(char *target, const char *needle, const char *replacement)
 {
   char buffer[1024] = { 0 };
@@ -125,7 +125,7 @@ str_replace(char *target, const char *needle, const char *replacement)
 }
 
 static char *
-exprs_expand(char *exprs, int vlistID)
+exprsExpand(char *exprs, int vlistID)
 {
   size_t len = strlen(exprs);
   unsigned nequal = 0, nsemi = 0;
@@ -384,12 +384,12 @@ Expr(void *process)
   operatorInputArg(cdoOperatorEnter(operatorID));
   operatorCheckArgc(1);
 
-  char *exprs = readsCommandLine ? exprs_from_arg(operatorArgv()[0]) : exprs_from_file(operatorArgv()[0]);
+  char *exprs = readsCommandLine ? exprsFromArgument(operatorArgv()[0]) : exprsFromFile(operatorArgv()[0]);
 
   int streamID1 = cdoStreamOpenRead(0);
   int vlistID1 = cdoStreamInqVlist(streamID1);
 
-  exprs = exprs_expand(exprs, vlistID1);
+  exprs = exprsExpand(exprs, vlistID1);
   if (cdoVerbose) cdoPrint(exprs);
 
   int nvars1 = vlistNvars(vlistID1);