Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / resall.c

diff --git a/src/gromacs/gmxpreprocess/resall.c b/src/gromacs/gmxpreprocess/resall.c
index 01e77a8a06fc7d662df1744ac9a09082ee8c7349..47616b2483e46e713346bcf8fcd81a71d9495167 100644 (file)
--- a/src/gromacs/gmxpreprocess/resall.c
+++ b/src/gromacs/gmxpreprocess/resall.c
@@ -79,20 +79,23 @@ gpp_atomtype_t read_atype(const char *ffdir, t_symtab *tab)
             /* Skip blank or comment-only lines */
             do
             {
-                fgets2(buf, STRLEN, in);
-                if (NULL != buf)
+                if (fgets2(buf, STRLEN, in) != NULL)
                 {
                     strip_comment(buf);
                     trim(buf);
                 }
             }
-            while (!feof(in) && NULL != buf && strlen(buf) == 0);
+            while (!feof(in) && strlen(buf) == 0);
 
-            if ((buf != NULL) && (sscanf(buf, "%s%lf", name, &m) == 2))
+            if (sscanf(buf, "%s%lf", name, &m) == 2)
             {
                 a->m = m;
                 add_atomtype(at, tab, a, name, nb, 0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 );
-                fprintf(stderr, "\rAtomtype %d", nratt+1);
+                fprintf(stderr, "\rAtomtype %d", ++nratt);
+            }
+            else
+            {
+                fprintf(stderr, "\nInvalid format: %s\n", buf);
             }
         }
         gmx_ffclose(in);