Rename remaining large_int to int64

Change-Id: I7f7dc5259cc6cc95a617b27189e6ea6195b24350

diff --git a/src/gromacs/commandline/pargs.cpp b/src/gromacs/commandline/pargs.cpp
index 245ec60790278123ab8b2d93366a76515166e1b7..cd4a1e05ea4a2140adc9bd9ed3f6a99215fa330e 100644 (file)
--- a/src/gromacs/commandline/pargs.cpp
+++ b/src/gromacs/commandline/pargs.cpp
@@ -229,7 +229,7 @@ static void get_pargs(int *argc, char *argv[], int nparg, t_pargs pa[],
                     case etINT:
                         *pa[j].u.i = iscan(*argc, argv, &i);
                         break;
-                    case etGMX_LARGE_INT:
+                    case etINT64:
                         *pa[j].u.is = istepscan(*argc, argv, &i);
                         break;
                     case etTIME:

diff --git a/src/gromacs/commandline/pargs.h b/src/gromacs/commandline/pargs.h
index b89a347d9549172de46ac364c512f6fa907c1ac5..6d07709be882f2b6b72e22e8b0e7f37f6de391cc 100644 (file)
--- a/src/gromacs/commandline/pargs.h
+++ b/src/gromacs/commandline/pargs.h
@@ -49,7 +49,7 @@ extern "C"
 /* This structure is used for parsing arguments off the comand line */
 enum
 {
-    etINT, etGMX_LARGE_INT, etREAL, etTIME, etSTR,    etBOOL, etRVEC,   etENUM, etNR
+    etINT, etINT64, etREAL, etTIME, etSTR,    etBOOL, etRVEC,   etENUM, etNR
 };
 
 typedef struct

diff --git a/src/gromacs/commandline/wman.cpp b/src/gromacs/commandline/wman.cpp
index de19f7aa3f5229752d9054bdc0c44c4e580c7617..6d2f2f20bfc9e5987c2f983f679702e8f745b357 100644 (file)
--- a/src/gromacs/commandline/wman.cpp
+++ b/src/gromacs/commandline/wman.cpp
@@ -204,7 +204,7 @@ static char *pa_val(t_pargs *pa, char buf[], int sz)
         case etINT:
             sprintf(buf, "%-d", *(pa->u.i));
             break;
-        case etGMX_LARGE_INT:
+        case etINT64:
             sprintf(buf, "%" GMX_PRId64, *(pa->u.is));
             break;
         case etTIME:

diff --git a/src/gromacs/fileio/enxio.c b/src/gromacs/fileio/enxio.c
index ba9b0c8f9d7c00e7fa6b858cfbc525c9cde97fd7..756fea85efad7ce140c39b8ce12438683e676622 100644 (file)
--- a/src/gromacs/fileio/enxio.c
+++ b/src/gromacs/fileio/enxio.c
@@ -181,7 +181,7 @@ static void enxsubblock_alloc(t_enxsubblock *sb)
                 sb->ival_alloc = sb->nr;
             }
             break;
-        case xdr_datatype_large_int:
+        case xdr_datatype_int64:
             if (sb->nr > sb->lval_alloc)
             {
                 srenew(sb->lval, sb->nr);
@@ -504,7 +504,7 @@ static gmx_bool do_eheader(ener_file_t ef, int *file_version, t_enxframe *fr,
         {
             *bOK = FALSE;
         }
-        if (!gmx_fio_do_gmx_large_int(ef->fio, fr->step))
+        if (!gmx_fio_do_int64(ef->fio, fr->step))
         {
             *bOK = FALSE;
         }
@@ -527,7 +527,7 @@ static gmx_bool do_eheader(ener_file_t ef, int *file_version, t_enxframe *fr,
         }
         if (*file_version >= 3)
         {
-            if (!gmx_fio_do_gmx_large_int(ef->fio, fr->nsteps))
+            if (!gmx_fio_do_int64(ef->fio, fr->nsteps))
             {
                 *bOK = FALSE;
             }
@@ -1059,8 +1059,8 @@ gmx_bool do_enx(ener_file_t ef, t_enxframe *fr)
                 case xdr_datatype_int:
                     bOK1 = gmx_fio_ndo_int(ef->fio, sub->ival, sub->nr);
                     break;
-                case xdr_datatype_large_int:
-                    bOK1 = gmx_fio_ndo_gmx_large_int(ef->fio, sub->lval, sub->nr);
+                case xdr_datatype_int64:
+                    bOK1 = gmx_fio_ndo_int64(ef->fio, sub->lval, sub->nr);
                     break;
                 case xdr_datatype_char:
                     bOK1 = gmx_fio_ndo_uchar(ef->fio, sub->cval, sub->nr);

diff --git a/src/gromacs/fileio/gmxfio.h b/src/gromacs/fileio/gmxfio.h
index 58cc2651c450e274bbcd8b8c08f29018d1b8283f..83c5403e5109fa7267dd97002bcbe68c7438d02c 100644 (file)
--- a/src/gromacs/fileio/gmxfio.h
+++ b/src/gromacs/fileio/gmxfio.h
@@ -56,7 +56,7 @@ enum {
 
 /* Enumerated for data types in files */
 enum {
-    eioREAL, eioFLOAT, eioDOUBLE, eioINT, eioGMX_LARGE_INT,
+    eioREAL, eioFLOAT, eioDOUBLE, eioINT, eioINT64,
     eioUCHAR, eioNUCHAR, eioUSHORT,
     eioRVEC, eioNRVEC, eioIVEC, eioSTRING, eioNR
 };
@@ -245,8 +245,8 @@ gmx_bool gmx_fio_reade_double(t_fileio *fio, double *item,
                               const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_reade_int(t_fileio *fio, int *item,
                            const char *desc, const char *srcfile, int line);
-gmx_bool gmx_fio_reade_gmx_large_int(t_fileio *fio, gmx_int64_t *item,
-                                     const char *desc, const char *srcfile, int line);
+gmx_bool gmx_fio_reade_int64(t_fileio *fio, gmx_int64_t *item,
+                             const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_reade_uchar(t_fileio *fio, unsigned char *item,
                              const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_reade_ushort(t_fileio *fio, unsigned short *item,
@@ -266,8 +266,8 @@ gmx_bool gmx_fio_writee_double(t_fileio *fio, double item,
                                const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_writee_int(t_fileio *fio, int item,
                             const char *desc, const char *srcfile, int line);
-gmx_bool gmx_fio_writee_gmx_large_int(t_fileio *fio, gmx_int64_t item,
-                                      const char *desc, const char *srcfile, int line);
+gmx_bool gmx_fio_writee_int64(t_fileio *fio, gmx_int64_t item,
+                              const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_writee_uchar(t_fileio *fio, unsigned char item,
                               const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_writee_ushort(t_fileio *fio, unsigned short item,
@@ -290,8 +290,8 @@ gmx_bool gmx_fio_doe_gmx_bool(t_fileio *fio, gmx_bool *item,
                               const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_doe_int(t_fileio *fio, int *item,
                          const char *desc, const char *srcfile, int line);
-gmx_bool gmx_fio_doe_gmx_large_int(t_fileio *fio, gmx_int64_t *item,
-                                   const char *desc, const char *srcfile, int line);
+gmx_bool gmx_fio_doe_int64(t_fileio *fio, gmx_int64_t *item,
+                           const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_doe_uchar(t_fileio *fio, unsigned char *item,
                            const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_doe_ushort(t_fileio *fio, unsigned short *item,
@@ -315,9 +315,9 @@ gmx_bool gmx_fio_nreade_double(t_fileio *fio, double *item, int n,
                                const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_nreade_int(t_fileio *fio, int *item, int n,
                             const char *desc, const char *srcfile, int line);
-gmx_bool gmx_fio_nreade_gmx_large_int(t_fileio *fio, gmx_int64_t *item, int n,
-                                      const char *desc, const char *srcfile,
-                                      int line);
+gmx_bool gmx_fio_nreade_int64(t_fileio *fio, gmx_int64_t *item, int n,
+                              const char *desc, const char *srcfile,
+                              int line);
 gmx_bool gmx_fio_nreade_uchar(t_fileio *fio, unsigned char *item, int n,
                               const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_nreade_ushort(t_fileio *fio, unsigned short *item, int n,
@@ -337,10 +337,10 @@ gmx_bool gmx_fio_nwritee_double(t_fileio *fio, const double *item, int n,
                                 const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_nwritee_int(t_fileio *fio, const int *item, int n,
                              const char *desc, const char *srcfile, int line);
-gmx_bool gmx_fio_nwritee_gmx_large_int(t_fileio *fio,
-                                       const gmx_int64_t *item, int n,
-                                       const char *desc, const char *srcfile,
-                                       int line);
+gmx_bool gmx_fio_nwritee_int64(t_fileio *fio,
+                               const gmx_int64_t *item, int n,
+                               const char *desc, const char *srcfile,
+                               int line);
 gmx_bool gmx_fio_nwritee_uchar(t_fileio *fio, const unsigned char *item, int n,
                                const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_nwritee_ushort(t_fileio *fio, const unsigned short *item, int n,
@@ -362,9 +362,9 @@ gmx_bool gmx_fio_ndoe_gmx_bool(t_fileio *fio, gmx_bool *item, int n,
                                const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_ndoe_int(t_fileio *fio, int *item, int n,
                           const char *desc, const char *srcfile, int line);
-gmx_bool gmx_fio_ndoe_gmx_large_int(t_fileio *fio, gmx_int64_t *item, int n,
-                                    const char *desc, const char *srcfile,
-                                    int line);
+gmx_bool gmx_fio_ndoe_int64(t_fileio *fio, gmx_int64_t *item, int n,
+                            const char *desc, const char *srcfile,
+                            int line);
 gmx_bool gmx_fio_ndoe_uchar(t_fileio *fio, unsigned char *item, int n,
                             const char *desc, const char *srcfile, int line);
 gmx_bool gmx_fio_ndoe_ushort(t_fileio *fio, unsigned short *item, int n,
@@ -383,7 +383,7 @@ gmx_bool gmx_fio_ndoe_string(t_fileio *fio, char *item[], int n,
 #define gmx_fio_read_float(fio, item)          gmx_fio_reade_float(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_read_double(fio, item)         gmx_fio_reade_double(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_read_int(fio, item)            gmx_fio_reade_int(fio, &item, (#item), __FILE__, __LINE__)
-#define gmx_fio_read_gmx_large_int(fio, item)  gmx_fio_reade_gmx_large_int(fio, &item, (#item), __FILE__, __LINE__)
+#define gmx_fio_read_int64(fio, item)          gmx_fio_reade_int64(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_read_uchar(fio, item)          gmx_fio_reade_uchar(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_read_ushort(fio, item)         gmx_fio_reade_ushort(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_read_rvec(fio, item)           gmx_fio_reade_rvec(fio, item, (#item), __FILE__, __LINE__)
@@ -394,7 +394,7 @@ gmx_bool gmx_fio_ndoe_string(t_fileio *fio, char *item[], int n,
 #define gmx_fio_write_float(fio, item)          gmx_fio_writee_float(fio, item, (#item), __FILE__, __LINE__)
 #define gmx_fio_write_double(fio, item)         gmx_fio_writee_double(fio, item, (#item), __FILE__, __LINE__)
 #define gmx_fio_write_int(fio, item)            gmx_fio_writee_int(fio, item, (#item), __FILE__, __LINE__)
-#define gmx_fio_write_gmx_large_int(fio, item)  gmx_fio_writee_gmx_large_int(fio, item, (#item), __FILE__, __LINE__)
+#define gmx_fio_write_int64(fio, item)          gmx_fio_writee_int64(fio, item, (#item), __FILE__, __LINE__)
 #define gmx_fio_write_uchar(fio, item)          gmx_fio_writee_uchar(fio, item, (#item), __FILE__, __LINE__)
 #define gmx_fio_write_ushort(fio, item)         gmx_fio_writee_ushort(fio, item, (#item), __FILE__, __LINE__)
 #define gmx_fio_write_rvec(fio, item)           gmx_fio_writee_rvec(fio, item, (#item), __FILE__, __LINE__)
@@ -404,9 +404,9 @@ gmx_bool gmx_fio_ndoe_string(t_fileio *fio, char *item[], int n,
 #define gmx_fio_do_real(fio, item)              gmx_fio_doe_real(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_do_float(fio, item)             gmx_fio_doe_float(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_do_double(fio, item)            gmx_fio_doe_double(fio, &item, (#item), __FILE__, __LINE__)
-#define gmx_fio_do_gmx_bool(fio, item)              gmx_fio_doe_gmx_bool(fio, &item, (#item), __FILE__, __LINE__)
+#define gmx_fio_do_gmx_bool(fio, item)          gmx_fio_doe_gmx_bool(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_do_int(fio, item)               gmx_fio_doe_int(fio, &item, (#item), __FILE__, __LINE__)
-#define gmx_fio_do_gmx_large_int(fio, item)     gmx_fio_doe_gmx_large_int(fio, &item, (#item), __FILE__, __LINE__)
+#define gmx_fio_do_int64(fio, item)             gmx_fio_doe_int64(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_do_uchar(fio, item)             gmx_fio_doe_uchar(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_do_ushort(fio, item)            gmx_fio_doe_ushort(fio, &item, (#item), __FILE__, __LINE__)
 #define gmx_fio_do_rvec(fio, item)              gmx_fio_doe_rvec(fio, &item, (#item), __FILE__, __LINE__)
@@ -420,7 +420,7 @@ gmx_bool gmx_fio_ndoe_string(t_fileio *fio, char *item[], int n,
 #define gmx_fio_nread_float(fio, item, n)           gmx_fio_nreade_float(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nread_double(fio, item, n)          gmx_fio_nreade_double(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nread_int(fio, item, n)             gmx_fio_nreade_int(fio, item, n, (#item), __FILE__, __LINE__)
-#define gmx_fio_nread_gmx_large_int(fio, item, n)   gmx_fio_nreade_gmx_large_int(fio, item, n, (#item), __FILE__, __LINE__)
+#define gmx_fio_nread_int64(fio, item, n)           gmx_fio_nreade_int64(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nread_uchar(fio, item, n)           gmx_fio_nreade_uchar(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nread_ushort(fio, item, n)          gmx_fio_nreade_ushort(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nread_rvec(fio, item, n)            gmx_fio_nreade_rvec(fio, item, n, (#item), __FILE__, __LINE__)
@@ -431,7 +431,7 @@ gmx_bool gmx_fio_ndoe_string(t_fileio *fio, char *item[], int n,
 #define gmx_fio_nwrite_float(fio, item, n)          gmx_fio_nwritee_float(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nwrite_double(fio, item, n)         gmx_fio_nwritee_double(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nwrite_int(fio, item, n)            gmx_fio_nwritee_int(fio, item, n, (#item), __FILE__, __LINE__)
-#define gmx_fio_nwrite_gmx_large_int(fio, item, n)  gmx_fio_nwritee_gmx_large_int(fio, item, n, (#item), __FILE__, __LINE__)
+#define gmx_fio_nwrite_int64(fio, item, n)          gmx_fio_nwritee_int64(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nwrite_uchar(fio, item, n)          gmx_fio_nwritee_uchar(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nwrite_ushort(fio, item, n)         gmx_fio_nwritee_ushort(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_nwrite_rvec(fio, item, n)           gmx_fio_nwritee_rvec(fio, item, n, (#item), __FILE__, __LINE__)
@@ -441,9 +441,9 @@ gmx_bool gmx_fio_ndoe_string(t_fileio *fio, char *item[], int n,
 #define gmx_fio_ndo_real(fio, item, n)              gmx_fio_ndoe_real(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_ndo_float(fio, item, n)             gmx_fio_ndoe_float(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_ndo_double(fio, item, n)            gmx_fio_ndoe_double(fio, item, n, (#item), __FILE__, __LINE__)
-#define gmx_fio_ndo_gmx_bool(fio, item, n)              gmx_fio_ndoe_gmx_bool(fio, item, n, (#item), __FILE__, __LINE__)
+#define gmx_fio_ndo_gmx_bool(fio, item, n)          gmx_fio_ndoe_gmx_bool(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_ndo_int(fio, item, n)               gmx_fio_ndoe_int(fio, item, n, (#item), __FILE__, __LINE__)
-#define gmx_fio_ndo_gmx_large_int(fio, item, n)     gmx_fio_ndoe_gmx_large_int(fio, item, n, (#item), __FILE__, __LINE__)
+#define gmx_fio_ndo_int64(fio, item, n)             gmx_fio_ndoe_int64(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_ndo_uchar(fio, item, n)             gmx_fio_ndoe_uchar(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_ndo_ushort(fio, item, n)            gmx_fio_ndoe_ushort(fio, item, n, (#item), __FILE__, __LINE__)
 #define gmx_fio_ndo_rvec(fio, item, n)              gmx_fio_ndoe_rvec(fio, item, n, (#item), __FILE__, __LINE__)

diff --git a/src/gromacs/fileio/gmxfio_asc.c b/src/gromacs/fileio/gmxfio_asc.c
index 57bc1b6a805b97c74e10e0633f4ae58d4e2787d0..d21114da5ab3c5cc101eed5aeb2d10ada9c8fc5a 100644 (file)
--- a/src/gromacs/fileio/gmxfio_asc.c
+++ b/src/gromacs/fileio/gmxfio_asc.c
@@ -170,7 +170,7 @@ static gmx_bool do_ascwrite(t_fileio *fio, const void *item, int nitem, int eio,
                                                                           desc,
                                                                           buf));
             break;
-        case eioGMX_LARGE_INT:
+        case eioINT64:
             sprintf(strbuf, "%s%s%s", "%", GMX_PRId64, "\n");
             res = fprintf(fp, strbuf, *((gmx_int64_t *) item),
                           gmx_fio_dbgstr(fio, desc, buf));
@@ -319,7 +319,7 @@ 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_SCNd64, &s);
             if (item)

diff --git a/src/gromacs/fileio/gmxfio_bin.c b/src/gromacs/fileio/gmxfio_bin.c
index 6c2bc2ab5d552ab1f32da237f5abae688bd89db3..c475879b6a1938e8ad9d8f44bf791d4908f86a6a 100644 (file)
--- a/src/gromacs/fileio/gmxfio_bin.c
+++ b/src/gromacs/fileio/gmxfio_bin.c
@@ -89,7 +89,7 @@ static gmx_bool do_binwrite(t_fileio *fio, const void *item, int nitem, int eio,
         case eioINT:
             size = sizeof(int);
             break;
-        case eioGMX_LARGE_INT:
+        case eioINT64:
             size = sizeof(gmx_int64_t);
             break;
         case eioUCHAR:
@@ -159,7 +159,7 @@ static gmx_bool do_binread(t_fileio *fio, void *item, int nitem, int eio,
         case eioINT:
             size = sizeof(int);
             break;
-        case eioGMX_LARGE_INT:
+        case eioINT64:
             size = sizeof(gmx_int64_t);
             break;
         case eioUCHAR:

diff --git a/src/gromacs/fileio/gmxfio_rw.c b/src/gromacs/fileio/gmxfio_rw.c
index bdeed1855408bb4527dba225b0c7afc88faa68c2..f7a6ab8a603ab68a6fe05ea8a6309cafbb2dd85f 100644 (file)
--- a/src/gromacs/fileio/gmxfio_rw.c
+++ b/src/gromacs/fileio/gmxfio_rw.c
@@ -104,12 +104,12 @@ gmx_bool gmx_fio_reade_int(t_fileio *fio, int *item,
     return ret;
 }
 
-gmx_bool gmx_fio_reade_gmx_large_int(t_fileio *fio, gmx_int64_t *item,
-                                     const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_reade_int64(t_fileio *fio, gmx_int64_t *item,
+                             const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret;
     gmx_fio_lock(fio);
-    ret = fio->iotp->nread(fio, item, 1, eioGMX_LARGE_INT, desc, srcfile, line);
+    ret = fio->iotp->nread(fio, item, 1, eioINT64, desc, srcfile, line);
     gmx_fio_unlock(fio);
     return ret;
 }
@@ -209,12 +209,12 @@ gmx_bool gmx_fio_writee_int(t_fileio *fio, int item,
     return ret;
 }
 
-gmx_bool gmx_fio_writee_gmx_large_int(t_fileio *fio, gmx_int64_t item,
-                                      const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_writee_int64(t_fileio *fio, gmx_int64_t item,
+                              const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret;
     gmx_fio_lock(fio);
-    ret = fio->iotp->nwrite(fio, &item, 1, eioGMX_LARGE_INT, desc, srcfile, line);
+    ret = fio->iotp->nwrite(fio, &item, 1, eioINT64, desc, srcfile, line);
     gmx_fio_unlock(fio);
     return ret;
 }
@@ -364,18 +364,18 @@ gmx_bool gmx_fio_doe_int(t_fileio *fio, int *item,
     return ret;
 }
 
-gmx_bool gmx_fio_doe_gmx_large_int(t_fileio *fio, gmx_int64_t *item,
-                                   const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_doe_int64(t_fileio *fio, gmx_int64_t *item,
+                           const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret;
     gmx_fio_lock(fio);
     if (fio->bRead)
     {
-        ret = fio->iotp->nread(fio, item, 1, eioGMX_LARGE_INT, desc, srcfile, line);
+        ret = fio->iotp->nread(fio, item, 1, eioINT64, desc, srcfile, line);
     }
     else
     {
-        ret = fio->iotp->nwrite(fio, item, 1, eioGMX_LARGE_INT, desc, srcfile, line);
+        ret = fio->iotp->nwrite(fio, item, 1, eioINT64, desc, srcfile, line);
     }
     gmx_fio_unlock(fio);
     return ret;
@@ -533,15 +533,15 @@ gmx_bool gmx_fio_nreade_int(t_fileio *fio, int *item, int n,
     return ret;
 }
 
-gmx_bool gmx_fio_nreade_gmx_large_int(t_fileio *fio, gmx_int64_t *item, int n,
-                                      const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_nreade_int64(t_fileio *fio, gmx_int64_t *item, int n,
+                              const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret = TRUE;
     int      i;
     gmx_fio_lock(fio);
     for (i = 0; i < n; i++)
     {
-        ret = ret && fio->iotp->nread(fio, &(item[i]), 1, eioGMX_LARGE_INT, desc,
+        ret = ret && fio->iotp->nread(fio, &(item[i]), 1, eioINT64, desc,
                                       srcfile, line);
     }
     gmx_fio_unlock(fio);
@@ -677,16 +677,16 @@ gmx_bool gmx_fio_nwritee_int(t_fileio *fio, const int *item, int n,
     return ret;
 }
 
-gmx_bool gmx_fio_nwritee_gmx_large_int(t_fileio *fio,
-                                       const gmx_int64_t *item, int n,
-                                       const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_nwritee_int64(t_fileio *fio,
+                               const gmx_int64_t *item, int n,
+                               const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret = TRUE;
     int      i;
     gmx_fio_lock(fio);
     for (i = 0; i < n; i++)
     {
-        ret = ret && fio->iotp->nwrite(fio, &(item[i]), 1, eioGMX_LARGE_INT,
+        ret = ret && fio->iotp->nwrite(fio, &(item[i]), 1, eioINT64,
                                        desc, srcfile, line);
     }
     gmx_fio_unlock(fio);
@@ -890,8 +890,8 @@ gmx_bool gmx_fio_ndoe_int(t_fileio *fio, int *item, int n,
 
 
 
-gmx_bool gmx_fio_ndoe_gmx_large_int(t_fileio *fio, gmx_int64_t *item, int n,
-                                    const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_ndoe_int64(t_fileio *fio, gmx_int64_t *item, int n,
+                            const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret = TRUE;
     int      i;
@@ -900,12 +900,12 @@ gmx_bool gmx_fio_ndoe_gmx_large_int(t_fileio *fio, gmx_int64_t *item, int n,
     {
         if (fio->bRead)
         {
-            ret = ret && fio->iotp->nread(fio, &(item[i]), 1, eioGMX_LARGE_INT, desc,
+            ret = ret && fio->iotp->nread(fio, &(item[i]), 1, eioINT64, desc,
                                           srcfile, line);
         }
         else
         {
-            ret = ret && fio->iotp->nwrite(fio, &(item[i]), 1, eioGMX_LARGE_INT, desc,
+            ret = ret && fio->iotp->nwrite(fio, &(item[i]), 1, eioINT64, desc,
                                            srcfile, line);
         }
     }

diff --git a/src/gromacs/fileio/gmxfio_xdr.c b/src/gromacs/fileio/gmxfio_xdr.c
index 11217cb6d7905d0c074846f57e808110cb8acd0c..6f4fec13dae80f28a0c0a81d5ed53810228625cc 100644 (file)
--- a/src/gromacs/fileio/gmxfio_xdr.c
+++ b/src/gromacs/fileio/gmxfio_xdr.c
@@ -147,12 +147,12 @@ static gmx_bool do_xdr(t_fileio *fio, void *item, int nitem, int eio,
                 *(int *) item = idum;
             }
             break;
-        case eioGMX_LARGE_INT:
+        case eioINT64:
             if (item && !fio->bRead)
             {
                 sdum = *(gmx_int64_t *) item;
             }
-            res = xdr_gmx_large_int(fio->xdr, &sdum);
+            res = xdr_int64(fio->xdr, &sdum);
             if (item)
             {
                 *(gmx_int64_t *) item = sdum;

diff --git a/src/gromacs/fileio/tpxio.c b/src/gromacs/fileio/tpxio.c
index 55a0cd6922c1ace8fd3d4ca8d07e1f18dc55e180..e921e0b9567986a8abb3d5402577f042d975617c 100644 (file)
--- a/src/gromacs/fileio/tpxio.c
+++ b/src/gromacs/fileio/tpxio.c
@@ -742,7 +742,7 @@ static void do_inputrec(t_fileio *fio, t_inputrec *ir, gmx_bool bRead,
     gmx_fio_do_int(fio, ir->eI);
     if (file_version >= 62)
     {
-        gmx_fio_do_gmx_large_int(fio, ir->nsteps);
+        gmx_fio_do_int64(fio, ir->nsteps);
     }
     else
     {
@@ -753,7 +753,7 @@ static void do_inputrec(t_fileio *fio, t_inputrec *ir, gmx_bool bRead,
     {
         if (file_version >= 62)
         {
-            gmx_fio_do_gmx_large_int(fio, ir->init_step);
+            gmx_fio_do_int64(fio, ir->init_step);
         }
         else
         {

diff --git a/src/gromacs/fileio/xdr_datatype.h b/src/gromacs/fileio/xdr_datatype.h
index 89537826c6dfb78b7fc7893613269cb95a7964b2..9343b524e1ebf00dc1617ab5c80711c01502e35e 100644 (file)
--- a/src/gromacs/fileio/xdr_datatype.h
+++ b/src/gromacs/fileio/xdr_datatype.h
@@ -49,7 +49,7 @@ typedef enum
     xdr_datatype_int,
     xdr_datatype_float,
     xdr_datatype_double,
-    xdr_datatype_large_int,
+    xdr_datatype_int64,
     xdr_datatype_char,
     xdr_datatype_string
 } xdr_datatype;

diff --git a/src/gromacs/fileio/xdrd.c b/src/gromacs/fileio/xdrd.c
index bfe81fd0aea54c09a26b3ddb3bd711f5b940dfe8..1ce76a4a2c112e69cef85168db9b28bc906ccbfb 100644 (file)
--- a/src/gromacs/fileio/xdrd.c
+++ b/src/gromacs/fileio/xdrd.c
@@ -94,7 +94,7 @@ int xdr3drcoord(XDR *xdrs, real *fp, int *size, real *precision)
 #endif
 }
 
-int xdr_gmx_large_int(XDR *xdrs, gmx_int64_t *i)
+int xdr_int64(XDR *xdrs, gmx_int64_t *i)
 {
     /* This routine stores values compatible with xdr_int64_t */
 

diff --git a/src/gromacs/fileio/xdrf.h b/src/gromacs/fileio/xdrf.h
index 3a19b42b9dfe86ed64642d63556718df79a25258..830867f72883f9b0edc4071d7ffac3959718ffc1 100644 (file)
--- a/src/gromacs/fileio/xdrf.h
+++ b/src/gromacs/fileio/xdrf.h
@@ -71,7 +71,7 @@ int xdr_real(XDR *xdrs, real *r);
 int xdr3drcoord(XDR *xdrs, real *fp, int *size, real *precision);
 
 
-int xdr_gmx_large_int(XDR *xdrs, gmx_int64_t *i);
+int xdr_int64(XDR *xdrs, gmx_int64_t *i);
 /* Read or write a gmx_int64_t value.
  * When warn!=NULL a warning will be written to stderr
  * when a value does not fit,

diff --git a/src/gromacs/gmxana/gmx_bar.c b/src/gromacs/gmxana/gmx_bar.c
index 9ab07bd480914c4164dc42a591427a2a095bf433..ed8063fe35c5c6c353c5ab539376df790a868edd 100644 (file)
--- a/src/gromacs/gmxana/gmx_bar.c
+++ b/src/gromacs/gmxana/gmx_bar.c
@@ -3033,7 +3033,7 @@ static samples_t *read_edr_hist_block(int *nsamples, t_enxblock *blk,
     /* check the block types etc. */
     if ( (blk->nsub < 2) ||
          (blk->sub[0].type != xdr_datatype_double) ||
-         (blk->sub[1].type != xdr_datatype_large_int) ||
+         (blk->sub[1].type != xdr_datatype_int64) ||
          (blk->sub[0].nr < 2)  ||
          (blk->sub[1].nr < 2) )
     {

diff --git a/src/gromacs/gmxana/gmx_energy.c b/src/gromacs/gmxana/gmx_energy.c
index 6d700e1726a1729e6952532880570b1791f705c0..d89dca5346441f789ba59e9d85832cf7a894c2f1 100644 (file)
--- a/src/gromacs/gmxana/gmx_energy.c
+++ b/src/gromacs/gmxana/gmx_energy.c
@@ -1709,7 +1709,7 @@ static void do_dhdl(t_enxframe *fr, t_inputrec *ir, FILE **fp_dhdl,
                 /* check the block types etc. */
                 if ( (blk->nsub < 2) ||
                      (blk->sub[0].type != xdr_datatype_double) ||
-                     (blk->sub[1].type != xdr_datatype_large_int) ||
+                     (blk->sub[1].type != xdr_datatype_int64) ||
                      (blk->sub[0].nr < 2)  ||
                      (blk->sub[1].nr < 2) )
                 {

diff --git a/src/gromacs/gmxana/gmx_tune_pme.c b/src/gromacs/gmxana/gmx_tune_pme.c
index 194bacb1f864f472f4bf142b735badfa71f030d3..f886be7cabe93fc00d6f084a5b2aebb5d7fb38dd 100644 (file)
--- a/src/gromacs/gmxana/gmx_tune_pme.c
+++ b/src/gromacs/gmxana/gmx_tune_pme.c
@@ -2189,11 +2189,11 @@ int gmx_tune_pme(int argc, char *argv[])
         { "-ntpr",     FALSE, etINT,  {&ntprs},
           "Number of [TT].tpr[tt] files to benchmark. Create this many files with different rcoulomb scaling factors depending on -rmin and -rmax. "
           "If < 1, automatically choose the number of [TT].tpr[tt] files to test" },
-        { "-steps",    FALSE, etGMX_LARGE_INT, {&bench_nsteps},
+        { "-steps",    FALSE, etINT64, {&bench_nsteps},
           "Take timings for this many steps in the benchmark runs" },
         { "-resetstep", FALSE, etINT,  {&presteps},
           "Let dlb equilibrate this many steps before timings are taken (reset cycle counters after this many steps)" },
-        { "-simsteps", FALSE, etGMX_LARGE_INT, {&new_sim_nsteps},
+        { "-simsteps", FALSE, etINT64, {&new_sim_nsteps},
           "If non-negative, perform this many steps in the real run (overwrites nsteps from [TT].tpr[tt], add [TT].cpt[tt] steps)" },
         { "-launch",   FALSE, etBOOL, {&bLaunch},
           "Launch the real simulation after optimization" },

diff --git a/src/gromacs/gmxlib/checkpoint.c b/src/gromacs/gmxlib/checkpoint.c
index 11e3707cdc6ddbaba40071664f7b5dc11b032f9b..68f18cac3163fb5bcd09ba6825a8e44e5ab832fa 100644 (file)
--- a/src/gromacs/gmxlib/checkpoint.c
+++ b/src/gromacs/gmxlib/checkpoint.c
@@ -278,7 +278,7 @@ static void do_cpt_step_err(XDR *xd, const char *desc, gmx_int64_t *i, FILE *lis
     bool_t res = 0;
     char   buf[STEPSTRSIZE];
 
-    res = xdr_gmx_large_int(xd, i);
+    res = xdr_int64(xd, i);
     if (res == 0)
     {
         cp_error();

diff --git a/src/gromacs/gmxlib/main.cpp b/src/gromacs/gmxlib/main.cpp
index 98ad830e868b5b3442c946b2bf1f16e7611732dc..677874faca01940c31951ed9c0198621e6b7e7ae 100644 (file)
--- a/src/gromacs/gmxlib/main.cpp
+++ b/src/gromacs/gmxlib/main.cpp
@@ -164,9 +164,9 @@ void check_multi_int(FILE *log, const gmx_multisim_t *ms, int val,
     sfree(ibuf);
 }
 
-void check_multi_large_int(FILE *log, const gmx_multisim_t *ms,
-                           gmx_int64_t val, const char *name,
-                           gmx_bool bQuiet)
+void check_multi_int64(FILE *log, const gmx_multisim_t *ms,
+                       gmx_int64_t val, const char *name,
+                       gmx_bool bQuiet)
 {
     gmx_int64_t      *ibuf;
     int               p;

diff --git a/src/gromacs/gmxlib/smalloc.c b/src/gromacs/gmxlib/smalloc.c
index d1337d78d8ffc1a44dc4d1f62620bf57e4a384f5..e1de2f7d328ae04de49f6a71c66da971b1b14459 100644 (file)
--- a/src/gromacs/gmxlib/smalloc.c
+++ b/src/gromacs/gmxlib/smalloc.c
@@ -105,13 +105,6 @@ static void log_action(int bMal, const char *what, const char *file, int line,
 }
 #endif
 
-static char *gmx_large_int_str(gmx_int64_t i, char *buf)
-{
-    sprintf(buf, "%"GMX_PRId64, i);
-
-    return buf;
-}
-
 void *save_malloc(const char *name, const char *file, int line, size_t size)
 {
     void *p;
@@ -125,12 +118,10 @@ void *save_malloc(const char *name, const char *file, int line, size_t size)
     {
         if ((p = malloc(size)) == NULL)
         {
-            char cbuf[22];
             gmx_fatal(errno, __FILE__, __LINE__,
-                      "Not enough memory. Failed to malloc %s bytes for %s\n"
+                      "Not enough memory. Failed to malloc %"GMX_PRId64 " bytes for %s\n"
                       "(called from file %s, line %d)",
-                      gmx_large_int_str((gmx_int64_t)size, cbuf),
-                      name, file, line);
+                      (gmx_int64_t)size, name, file, line);
         }
         (void) memset(p, 0, size);
     }
@@ -227,12 +218,10 @@ void *save_realloc(const char *name, const char *file, int line, void *ptr,
         }
         if (p == NULL)
         {
-            char cbuf[22];
             gmx_fatal(errno, __FILE__, __LINE__,
-                      "Not enough memory. Failed to realloc %s bytes for %s, %s=%x\n"
+                      "Not enough memory. Failed to realloc %"GMX_PRId64 " bytes for %s, %s=%x\n"
                       "(called from file %s, line %d)",
-                      gmx_large_int_str((gmx_int64_t)size, cbuf),
-                      name, name, ptr, file, line);
+                      (gmx_int64_t)size, name, name, ptr, file, line);
         }
 #ifdef DEBUG
         log_action(1, name, file, line, 1, size, p);

diff --git a/src/gromacs/gmxlib/txtdump.c b/src/gromacs/gmxlib/txtdump.c
index 44b2d85f0b1a8309d5fc6c6b7660efe07cc53ee5..cf78a4f92026c896f34a5417cd9f9e9e6265392f 100644 (file)
--- a/src/gromacs/gmxlib/txtdump.c
+++ b/src/gromacs/gmxlib/txtdump.c
@@ -336,7 +336,7 @@ static void pr_int(FILE *fp, int indent, const char *title, int i)
     fprintf(fp, "%-20s = %d\n", title, i);
 }
 
-static void pr_gmx_large_int(FILE *fp, int indent, const char *title, gmx_int64_t i)
+static void pr_int64(FILE *fp, int indent, const char *title, gmx_int64_t i)
 {
     char buf[STEPSTRSIZE];
 
@@ -541,7 +541,7 @@ static void pr_cosine(FILE *fp, int indent, const char *title, t_cosines *cos,
 
 #define PS(t, s) pr_str(fp, indent, t, s)
 #define PI(t, s) pr_int(fp, indent, t, s)
-#define PSTEP(t, s) pr_gmx_large_int(fp, indent, t, s)
+#define PSTEP(t, s) pr_int64(fp, indent, t, s)
 #define PR(t, s) pr_real(fp, indent, t, s)
 #define PD(t, s) pr_double(fp, indent, t, s)
 

diff --git a/src/gromacs/legacyheaders/main.h b/src/gromacs/legacyheaders/main.h
index c7c7d4c09b67cbbbdf92ed1a141e8964b3bbead4..0c23dd4a5242e63e7180b8210ad1d5d4f6b815b5 100644 (file)
--- a/src/gromacs/legacyheaders/main.h
+++ b/src/gromacs/legacyheaders/main.h
@@ -63,9 +63,9 @@ void gmx_log_close(FILE *fp);
 void check_multi_int(FILE *log, const gmx_multisim_t *ms,
                      int val, const char *name,
                      gmx_bool bQuiet);
-void check_multi_large_int(FILE *log, const gmx_multisim_t *ms,
-                           gmx_int64_t val, const char *name,
-                           gmx_bool bQuiet);
+void check_multi_int64(FILE *log, const gmx_multisim_t *ms,
+                       gmx_int64_t val, const char *name,
+                       gmx_bool bQuiet);
 /* Check if val is the same on all processors for a mdrun -multi run
  * The string name is used to print to the log file and in a fatal error
  * if the val's don't match. If bQuiet is true and the check passes,

diff --git a/src/gromacs/mdlib/mdebin_bar.c b/src/gromacs/mdlib/mdebin_bar.c
index e4a722be311d8144e17505d70d2ad46ccb84946d..7ddebc0c869f8c430ee9389c6c9c4d6da2a82263 100644 (file)
--- a/src/gromacs/mdlib/mdebin_bar.c
+++ b/src/gromacs/mdlib/mdebin_bar.c
@@ -345,7 +345,7 @@ void mde_delta_h_handle_block(t_mde_delta_h *dh, t_enxblock *blk)
         dh->subblock_meta_l[k++] = dh->derivative;
 
         blk->sub[1].nr   = nhist_written+3;
-        blk->sub[1].type = xdr_datatype_large_int;
+        blk->sub[1].type = xdr_datatype_int64;
         blk->sub[1].lval = dh->subblock_meta_l;
 
         /* subblock 3 + 4 : the histogram data */

diff --git a/src/programs/gmx/gmxdump.c b/src/programs/gmx/gmxdump.c
index cfe5d400cd13bc60f7759d1eac285518b982e1e4..d79cf33511e2a34da52218fc845d98e3f1032782 100644 (file)
--- a/src/programs/gmx/gmxdump.c
+++ b/src/programs/gmx/gmxdump.c
@@ -445,7 +445,7 @@ void list_ene(const char *fn)
                                 printf("%14d %10d\n", j, sb->ival[j]);
                             }
                             break;
-                        case xdr_datatype_large_int:
+                        case xdr_datatype_int64:
                             for (j = 0; j < sb->nr; j++)
                             {
                                 printf("%14d %s\n",

diff --git a/src/programs/gmx/tpbcmp.c b/src/programs/gmx/tpbcmp.c
index ede4e5836ae548aac6867a34f6437bb620ef4727..add3e9f80eb3ac9c470b1cdb96148a5f1d833adf 100644 (file)
--- a/src/programs/gmx/tpbcmp.c
+++ b/src/programs/gmx/tpbcmp.c
@@ -71,7 +71,7 @@ static void cmp_int(FILE *fp, const char *s, int index, int i1, int i2)
     }
 }
 
-static void cmp_gmx_large_int(FILE *fp, const char *s, gmx_int64_t i1, gmx_int64_t i2)
+static void cmp_int64(FILE *fp, const char *s, gmx_int64_t i1, gmx_int64_t i2)
 {
     if (i1 != i2)
     {
@@ -745,8 +745,8 @@ static void cmp_inputrec(FILE *fp, t_inputrec *ir1, t_inputrec *ir2, real ftol,
      * #define CIR(s) cmp_real(fp,"inputrec->"#s,0,ir1->##s,ir2->##s,ftol)
      */
     cmp_int(fp, "inputrec->eI", -1, ir1->eI, ir2->eI);
-    cmp_gmx_large_int(fp, "inputrec->nsteps", ir1->nsteps, ir2->nsteps);
-    cmp_gmx_large_int(fp, "inputrec->init_step", ir1->init_step, ir2->init_step);
+    cmp_int64(fp, "inputrec->nsteps", ir1->nsteps, ir2->nsteps);
+    cmp_int64(fp, "inputrec->init_step", ir1->init_step, ir2->init_step);
     cmp_int(fp, "inputrec->simulation_part", -1, ir1->simulation_part, ir2->simulation_part);
     cmp_int(fp, "inputrec->ePBC", -1, ir1->ePBC, ir2->ePBC);
     cmp_int(fp, "inputrec->bPeriodicMols", -1, ir1->bPeriodicMols, ir2->bPeriodicMols);
@@ -1311,7 +1311,7 @@ static void cmp_eblocks(t_enxframe *fr1, t_enxframe *fr2, real ftol, real abstol
                     s2 = &(b2->sub[i]);
 
                     cmp_int(stdout, buf, -1, (int)s1->type, (int)s2->type);
-                    cmp_gmx_large_int(stdout, buf, s1->nr, s2->nr);
+                    cmp_int64(stdout, buf, s1->nr, s2->nr);
 
                     if ((s1->type == s2->type) && (s1->nr == s2->nr))
                     {
@@ -1340,11 +1340,11 @@ static void cmp_eblocks(t_enxframe *fr1, t_enxframe *fr2, real ftol, real abstol
                                             s1->ival[k], s2->ival[k]);
                                 }
                                 break;
-                            case xdr_datatype_large_int:
+                            case xdr_datatype_int64:
                                 for (k = 0; k < s1->nr; k++)
                                 {
-                                    cmp_gmx_large_int(stdout, buf,
-                                                      s1->lval[k], s2->lval[k]);
+                                    cmp_int64(stdout, buf,
+                                              s1->lval[k], s2->lval[k]);
                                 }
                                 break;
                             case xdr_datatype_char:

diff --git a/src/programs/mdrun/mdrun.cpp b/src/programs/mdrun/mdrun.cpp
index b2d3421ea1be235da75418e95ce30e295640ebdc..ad60cbe66ae3be182b949365051905ee6575b306 100644 (file)
--- a/src/programs/mdrun/mdrun.cpp
+++ b/src/programs/mdrun/mdrun.cpp
@@ -537,7 +537,7 @@ int gmx_mdrun(int argc, char *argv[])
           "Keep and number checkpoint files" },
         { "-append",  FALSE, etBOOL, {&bAppendFiles},
           "Append to previous output files when continuing from checkpoint instead of adding the simulation part number to all file names" },
-        { "-nsteps",  FALSE, etGMX_LARGE_INT, {&nsteps},
+        { "-nsteps",  FALSE, etINT64, {&nsteps},
           "Run this number of steps, overrides .mdp file option" },
         { "-maxh",   FALSE, etREAL, {&max_hours},
           "Terminate after 0.99 times this time (hours)" },

diff --git a/src/programs/mdrun/repl_ex.c b/src/programs/mdrun/repl_ex.c
index 0b954a8b5de494372c411eb09ee138151146b772..786c55cae28becbb01e7bbbeeef7e4901a77a0bf 100644 (file)
--- a/src/programs/mdrun/repl_ex.c
+++ b/src/programs/mdrun/repl_ex.c
@@ -165,9 +165,9 @@ gmx_repl_ex_t init_replica_exchange(FILE *fplog,
 
     check_multi_int(fplog, ms, state->natoms, "the number of atoms", FALSE);
     check_multi_int(fplog, ms, ir->eI, "the integrator", FALSE);
-    check_multi_large_int(fplog, ms, ir->init_step+ir->nsteps, "init_step+nsteps", FALSE);
-    check_multi_large_int(fplog, ms, (ir->init_step+nst-1)/nst,
-                          "first exchange step: init_step/-replex", FALSE);
+    check_multi_int64(fplog, ms, ir->init_step+ir->nsteps, "init_step+nsteps", FALSE);
+    check_multi_int64(fplog, ms, (ir->init_step+nst-1)/nst,
+                      "first exchange step: init_step/-replex", FALSE);
     check_multi_int(fplog, ms, ir->etc, "the temperature coupling", FALSE);
     check_multi_int(fplog, ms, ir->opts.ngtc,
                     "the number of temperature coupling groups", FALSE);