Ticket #21611: patch-preproc.c.diff

preproc.c

@@ -3205 +3205 @@
       goto bin;
 
    nline++;
-   if (sscanf(line,"%5d",&ntun)!=1)
+   if (sscanf(line,"%5ld",&ntun)!=1)
       goto bin;
 
    if (ntun<1 || ntun>3)  goto bin;
@@ -3219 +3219 @@
       goto bin;
 
    nline++;
-   if (sscanf(line,"%5d",&nratt)!=1) /* # of atom types */
+   if (sscanf(line,"%5ld",&nratt)!=1) /* # of atom types */
 
       goto bin;
 
@@ -3269 +3269 @@
    if (fgets(line,120,filep)==NULL)
       goto err1;
 
-   if (sscanf(line,"%5d",&nraa2)!=1) /* Number of residues */
+   if (sscanf(line,"%5ld",&nraa2)!=1) /* Number of residues */
 
       goto err1;
 
@@ -3293 +3293 @@
 
    if (fgets(line,120,filep)==NULL)
       goto err1;
-   if (sscanf(line,"%5d",&nrp)!=1)
+   if (sscanf(line,"%5ld",&nrp)!=1)
       goto err1;
 
    if (nrp<1 || nrp>MAXATM)
@@ -3347 +3347 @@
    /* Skip over the nbty - BUG: Comment what is nbty??? */
 
 
-   if (sscanf(line,"%5d",&nbty)!=1)
+   if (sscanf(line,"%5ld",&nbty)!=1)
       goto err1;
 
    n = (nbty+3)/4;
@@ -3365 +3365 @@
       goto err1;
    /* Read about bonds involving hydrogen */
 
-   if (sscanf(line,"%5d",&nbonh)!=1)
+   if (sscanf(line,"%5ld",&nbonh)!=1)
       goto err1;
 
    for (k=0;k<nbonh;k++)
@@ -3375 +3375 @@
       if (fgets(line,120,filep)==NULL)
          goto err1;
 
-      if (sscanf(line,"%5d%5d",&ibond[k][0],&ibond[k][1])!=2)
+      if (sscanf(line,"%5ld%5ld",&ibond[k][0],&ibond[k][1])!=2)
          goto err1;
       }
 
@@ -3390 +3390 @@
 
    /* seem to throw around bonds involving H */
 
-   if (sscanf(line,"%5d",&nbond)!=1)
+   if (sscanf(line,"%5ld",&nbond)!=1)
       goto err1;
 
    {
@@ -3405 +3405 @@
       if (fgets(line,120,filep)==NULL)
          goto err1;
 
-      if (sscanf(line,"%5d%5d",&ibond[k][0],&ibond[k][1])!=2)
+      if (sscanf(line,"%5ld%5ld",&ibond[k][0],&ibond[k][1])!=2)
          goto err1;
       }
 
@@ -3425 +3425 @@
 
 
    filep = fopen_or_exit_if_error("bond.dat","w");
-   fprintf(filep,"%5d %5d\n",nbonh,nbond);
+   fprintf(filep,"%5ld %5ld\n",nbonh,nbond);
    for (k=0;k<nbonh+nbond+1;k++)
       fprintf(filep,"%5d %5d %5d\n",ib[k][0],ib[k][1],ib[k][2]);
    fclose_or_exit_if_error("bond.dat",filep);
@@ -3536 +3536 @@
   goto write;
 
 err1:
-  printf("\n Error reading gromos formatted molecular topology file at line %d\n\n",nline);
+  printf("\n Error reading gromos formatted molecular topology file at line %ld\n\n",nline);
   fclose(filep);
 
 
@@ -3914 +3914 @@
    bufptr = getuflong(buff,&nattyp,1);
    if (nattyp>MAXATP)
       {
-      printf("\nError: (# of atom types) NATTYP=%d exceeds (Max # atom types) MAXATP=%d\n",nattyp,MAXATP);
+      printf("\nError: (# of atom types) NATTYP=%ld exceeds (Max # atom types) MAXATP=%d\n",nattyp,MAXATP);
       exit(EXIT_FAILURE);
       }
 
@@ -3966 +3966 @@
    bufptr = getuflong(bufptr,&natmov,1);
    if (natmov>natom)
       {
-      printf("NATMOV=%d > NATOM=%d??\n\n",natmov,natom);
+      printf("NATMOV=%ld > NATOM=%ld??\n\n",natmov,natom);
       exit(EXIT_FAILURE);
       }
 
@@ -4020 +4020 @@
    getuflong(buff,&nbond,1);
    if (nbond>MAXBND)
       {
-      printf("\nError:  NBOND=%d exceeds MAXBND=%d\n\n",nbond,MAXBND);
+      printf("\nError:  NBOND=%ld exceeds MAXBND=%d\n\n",nbond,MAXBND);
       exit(EXIT_FAILURE);
       }