File utils to C++.

Preparation for moving get_libdir() into gmx::ProgramInfo.

Change-Id: Ic13b0567e7528e43ea03298f835b3d842ab44c28

diff --git a/src/gromacs/gmxlib/futil.c b/src/gromacs/gmxlib/futil.cpp
similarity index 99%
rename from src/gromacs/gmxlib/futil.c
rename to src/gromacs/gmxlib/futil.cpp
index befa0679a8a676084e9c3fdb2a7a97b25f6cd9dd..c1303f43adad3a3d5273bf4dc10a807a9ddf08e3 100644 (file)
--- a/src/gromacs/gmxlib/futil.c
+++ b/src/gromacs/gmxlib/futil.cpp
@@ -486,8 +486,7 @@ gmx_bool make_backup(const char * name)
         env = getenv("GMX_MAXBACKUP");
         if (env != NULL)
         {
-            count_max = 0;
-            sscanf(env, "%d", &count_max);
+            count_max = strtol(env, NULL, 10);
             if (count_max == -1)
             {
                 /* Do not make backups and possibly overwrite old files */
@@ -522,7 +521,7 @@ FILE *ffopen(const char *file, const char *mode)
     return fopen(file, mode);
 #else
     FILE    *ff = NULL;
-    char     buf[256], *bf, *bufsize = 0, *ptr;
+    char     buf[256], *bufsize = 0, *ptr;
     gmx_bool bRead;
     int      bs;
 
@@ -850,7 +849,7 @@ gmx_bool get_libdir(char *libdir)
     char     buf[GMX_BINNAME_MAX];
     char     full_path[GMX_PATH_MAX+GMX_BINNAME_MAX];
     char     system_path[GMX_PATH_MAX];
-    char    *dir, *ptr, *s, *pdum;
+    char    *dir, *ptr, *s;
     gmx_bool found = FALSE;
     int      i;
 

diff --git a/src/gromacs/gmxpreprocess/fflibutil.c b/src/gromacs/gmxpreprocess/fflibutil.cpp
similarity index 99%
rename from src/gromacs/gmxpreprocess/fflibutil.c
rename to src/gromacs/gmxpreprocess/fflibutil.cpp
index bd34581a9ba67bb848e71e62c9fecfc5db9cba6a..e38ecbb533425aa2104cf7d030b83bb72da54bb6 100644 (file)
--- a/src/gromacs/gmxpreprocess/fflibutil.c
+++ b/src/gromacs/gmxpreprocess/fflibutil.cpp
@@ -143,15 +143,12 @@ static int low_fflib_search_file_end(const char *ffdir,
                                      char     ***filenames,
                                      char     ***filenames_short)
 {
-    char           *ret = NULL;
     char           *lib, *dir;
-    char            buf[1024];
     char           *libpath;
     gmx_bool        env_is_set;
     int             len_fe, len_name;
     char          **fns, **fns_short;
     char            dir_print[GMX_PATH_MAX];
-    char           *pdum;
     char           *s, fn_dir[GMX_PATH_MAX];
     gmx_directory_t dirhandle;
     char            nextname[STRLEN];