BUILD : 1.7.9 (793) BUGS : 378 NOTES : Applied patch

git-svn-id: svn://svn.anope.org/anope/trunk@793 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@552 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 2 insertions, 8 deletions

diff --git a/src/modules/ns_noop.c b/src/modules/ns_noop.c
index f78618572..384e673ec 100644
--- a/src/modules/ns_noop.c
+++ b/src/modules/ns_noop.c
@@ -257,8 +257,7 @@ int mLoadData(void)
         alog("ns_noop: WARNING: Can not open database file! (it might not exist, this is not fatal)");
         ret = 1;
     } else {
-        while (!feof(in)) {
-            fgets(buffer, 1500, in);
+        while (fgets(buffer, 1500, in)) {
             name = myStrGetToken(buffer, ' ', 0);
             if (name) {
                 len = strlen(name);
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index 5d68ac7f0..97904cfd7 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -188,7 +188,6 @@ int myAddNickInfo(User * u)
         } else {
             moduleNoticeLang(s_NickServ, u, OINFO_SYNTAX);
         }
-        free(text);
     }
     return MOD_CONT;
 }
@@ -257,7 +256,6 @@ int myAddChanInfo(User * u)
         } else {
             moduleNoticeLang(s_ChanServ, u, OCINFO_SYNTAX);
         }
-        free(text);
     }
     return MOD_CONT;
 }
@@ -296,7 +294,6 @@ int myNickInfo(User * u)
                 }
                 free(nick);
             }
-            free(text);
         }
     }
     return MOD_CONT;
@@ -330,7 +327,6 @@ int myChanInfo(User * u)
                 }
                 free(chan);
             }
-            free(text);
         }
     }
     return MOD_CONT;
@@ -361,8 +357,7 @@ int mLoadData(void)
         alog("os_info: WARNING: can not open the database file! (it might not exist, this is not fatal)");
         ret = 1;
     } else {
-        while (!feof(in)) {
-            fgets(buffer, 1500, in);
+        while (fgets(buffer, 1500, in)) {
             type = myStrGetToken(buffer, ' ', 0);
             name = myStrGetToken(buffer, ' ', 1);
             info = myStrGetTokenRemainder(buffer, ' ', 2);