Rob Shearman : server: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f12f8503a3349512ccd7b6537352ae6665f9eb3b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f12f8503a3349512ccd7b65373...

Author: Rob Shearman 
Date:   Thu Jan 21 11:57:45 2010 +0000

server: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings.

---

server/change.c |    4 ++--
 server/main.c   |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/change.c b/server/change.c
index 9a1a02d..0dd7d29 100644
--- a/server/change.c
+++ b/server/change.c
@@ -451,8 +451,8 @@ struct inode {
     char *name;              /* basename name of the inode */
 };

-struct list inode_hash[ HASH_SIZE ];
-struct list wd_hash[ HASH_SIZE ];
+static struct list inode_hash[ HASH_SIZE ];
+static struct list wd_hash[ HASH_SIZE ];

static int inotify_add_dir( char *path, unsigned int filter );

diff --git a/server/main.c b/server/main.c
index dd5ed53..a59350b 100644
--- a/server/main.c
+++ b/server/main.c
@@ -65,14 +65,14 @@ static void parse_args( int argc, char *argv[] )

static struct option long_options[] =
     {
-        {"debug",       2, 0, 'd'},
-        {"foreground",  0, 0, 'f'},
-        {"help",        0, 0, 'h'},
-        {"kill",        2, 0, 'k'},
-        {"persistent",  2, 0, 'p'},
-        {"version",     0, 0, 'v'},
-        {"wait",        0, 0, 'w'},
-        { NULL,         0, 0, 0}
+        {"debug",       2, NULL, 'd'},
+        {"foreground",  0, NULL, 'f'},
+        {"help",        0, NULL, 'h'},
+        {"kill",        2, NULL, 'k'},
+        {"persistent",  2, NULL, 'p'},
+        {"version",     0, NULL, 'v'},
+        {"wait",        0, NULL, 'w'},
+        { NULL,         0, NULL, 0}
     };

server_argv0 = argv[0];