ntp_scanner lint removal

bk: 491a877fgeKMXPEj9-XqNVuUEiZ6kg

diff --git a/ChangeLog b/ChangeLog
index 1623be496091dd3d7645b69f346f179b675a7f7c..7e5acce8f62aca8fe64cdddd1dca1e775971824b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Cleanup lint from the ntp_scanner files.
 * [Bug 1011] gmtime() returns NULL on windows where it would not under Unix.
 * Updated caljulian.c and prettydate.c from Juergen Perlinger.
 (4.2.5p139) 2008/11/11 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_scanner.c b/ntpd/ntp_scanner.c
index 3f2c38cc39b427e28956f3f5027ae4f9815451bb..afe1777cc1d6ac101b94b6a376253fdeb113bf93 100644 (file)
--- a/ntpd/ntp_scanner.c
+++ b/ntpd/ntp_scanner.c
@@ -603,7 +603,8 @@ yylex()
         */
        
        if ((expect_string == NO_ARG) &&  (!instring)) {
-               if (token = is_keyword(yytext, &expect_string)) 
+               token = is_keyword(yytext, &expect_string);
+               if (token) 
                        return token;
                else if (is_integer(yytext)) {
                        errno = 0;

diff --git a/ntpd/ntp_scanner.h b/ntpd/ntp_scanner.h
index 527aa6c69ae3c4230bd7d9354e4a5422e4a3945a..e5df1a5f74d95a0be3865de2849094800ad4dabd 100644 (file)
--- a/ntpd/ntp_scanner.h
+++ b/ntpd/ntp_scanner.h
@@ -30,7 +30,7 @@ struct key_tok {
 
 /* Structure to hold a filename, file pointer and positional info */
 struct FILE_INFO {
-    char *fname;               /* Path to the file */
+    const char *fname;        /* Path to the file */
     FILE *fd;                  /* File Descriptor */
     int line_no;               /* Line Number in the file being scanned */
     int col_no;                /* Column Number in the file being scanned */