Fix ICC warnings

[alexxy/gromacs.git] / src / gromacs / fileio / gmxfio_asc.c

diff --git a/src/gromacs/fileio/gmxfio_asc.c b/src/gromacs/fileio/gmxfio_asc.c
index c02cab30c5ff0228b4d262a3f652b6326cb98bd8..f819a8d7a0a25c2a6199ce73f4cffe80e0799680 100644 (file)
--- a/src/gromacs/fileio/gmxfio_asc.c
+++ b/src/gromacs/fileio/gmxfio_asc.c
@@ -2,8 +2,8 @@
  * This file is part of the GROMACS molecular simulation package.
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
- * Copyright (c) 2001-2004, The GROMACS development team,
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2001-2004, The GROMACS development team.
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -34,33 +34,28 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
 
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <ctype.h>
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
 
-#include "gmx_fatal.h"
-#include "macros.h"
-#include "smalloc.h"
-#include "futil.h"
-#include "filenm.h"
-#include "string2.h"
-#include "gmxfio.h"
-#include "md5.h"
-
-#ifdef GMX_THREAD_MPI
-#include "thread_mpi.h"
-#endif
-
-#include "gmxfio_int.h"
+#include "gromacs/fileio/filenm.h"
+#include "gromacs/fileio/gmxfio.h"
+#include "gromacs/fileio/gmxfio_int.h"
+#include "gromacs/fileio/md5.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 
 /* This is the part that reads dummy and ascii files.  */
@@ -107,7 +102,7 @@ static void encode_string(int maxlen, char dst[], const char src[])
 {
     int i;
 
-    for (i = 0; (src[i] != '\0') && (i < maxlen - 1); i++)
+    for (i = 0; (i < maxlen - 1) && (src[i] != '\0'); i++)
     {
         if ((src[i] == ' ') || (src[i] == '\t'))
         {
@@ -130,7 +125,7 @@ static void decode_string(int maxlen, char dst[], const char src[])
 {
     int i;
 
-    for (i = 0; (src[i] != '\0') && (i < maxlen - 1); i++)
+    for (i = 0; (i < maxlen - 1) && (src[i] != '\0'); i++)
     {
         if (src[i] == '_')
         {
@@ -174,9 +169,9 @@ static gmx_bool do_ascwrite(t_fileio *fio, const void *item, int nitem, int eio,
                                                                           desc,
                                                                           buf));
             break;
-        case eioGMX_LARGE_INT:
-            sprintf(strbuf, "%s%s%s", "%", gmx_large_int_fmt, "\n");
-            res = fprintf(fp, strbuf, *((gmx_large_int_t *) item),
+        case eioINT64:
+            sprintf(strbuf, "%s%s%s", "%", GMX_PRId64, "\n");
+            res = fprintf(fp, strbuf, *((gmx_int64_t *) item),
                           gmx_fio_dbgstr(fio, desc, buf));
             break;
         case eioUCHAR:
@@ -296,10 +291,11 @@ static gmx_bool do_ascread(t_fileio *fio, void *item, int nitem, int eio,
 {
     FILE           *fp = fio->fp;
     int             i, m, res = 0, *iptr, ix;
-    gmx_large_int_t s;
+    gmx_int64_t     s;
     double          d, x;
+    char            c;
     real           *ptr;
-    unsigned char   uc, *ucptr;
+    unsigned char  *ucptr;
     char           *cptr;
 #define NEXT_ITEM_BUF_LEN 128
     char            ni_buf[NEXT_ITEM_BUF_LEN];
@@ -323,19 +319,19 @@ static gmx_bool do_ascread(t_fileio *fio, void *item, int nitem, int eio,
                 *((int *) item) = i;
             }
             break;
-        case eioGMX_LARGE_INT:
+        case eioINT64:
             res = sscanf(next_item(fp, ni_buf, NEXT_ITEM_BUF_LEN),
-                         gmx_large_int_pfmt, &s);
+                         "%"GMX_SCNd64, &s);
             if (item)
             {
-                *((gmx_large_int_t *) item) = s;
+                *((gmx_int64_t *) item) = s;
             }
             break;
         case eioUCHAR:
-            res = sscanf(next_item(fp, ni_buf, NEXT_ITEM_BUF_LEN), "%c", &uc);
+            res = sscanf(next_item(fp, ni_buf, NEXT_ITEM_BUF_LEN), "%c", &c);
             if (item)
             {
-                *((unsigned char *) item) = uc;
+                *((unsigned char *) item) = (unsigned char)c;
             }
             break;
         case eioNUCHAR: