From 193ec5109dedb23058dfa734545313b5b3ba10c8 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Wed, 10 Feb 2010 16:54:30 -0800
Subject: [PATCH] ovs-wdt: Mark variable static and use NULL for a null
pointer.
Neither is really a bug but it's cleaner this way.
Found by sparse (http://sparse.wiki.kernel.org/).
---
utilities/ovs-wdt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/utilities/ovs-wdt.c b/utilities/ovs-wdt.c
index fc3efb19..fedc65c3 100644
--- a/utilities/ovs-wdt.c
+++ b/utilities/ovs-wdt.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009 Nicira Networks, Inc.
+/* Copyright (c) 2008, 2009, 2010 Nicira Networks, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
#define DEFAULT_INTERVAL 1
#define DEFAULT_TIMEOUT 30
-int fd = -1;
+static int fd = -1;
/* The WDT is automatically enabled when /dev/watchdog is opened. If we
* do not send the magic value to the device first before exiting, the
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
{"help", no_argument, NULL, 'h'},
{"verbose", no_argument, NULL, 'v'},
{"version", no_argument, NULL, 'V'},
- {0, 0, 0, 0}
+ {NULL, 0, NULL, 0}
};
setup_signal();
--
2.30.2