X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-wdt.c;h=fedc65c36e179dfc859cc4472994d0e6e837bea7;hb=4e312e694f1e9e34ed0aad7d5778b73d7add270d;hp=3c5d797c02474b4e97f9b8c6af25717cd192b467;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch

diff --git a/utilities/ovs-wdt.c b/utilities/ovs-wdt.c
index 3c5d797c..fedc65c3 100644
--- a/utilities/ovs-wdt.c
+++ b/utilities/ovs-wdt.c
@@ -1,28 +1,16 @@
-/* Copyright (c) 2008, 2009 Nicira Networks, Inc.
+/* Copyright (c) 2008, 2009, 2010 Nicira Networks, Inc.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, Nicira Networks gives permission
- * to link the code of its release of vswitchd with the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the same
- * license as the "OpenSSL" library), and distribute the linked
- * executables.  You must obey the GNU General Public License in all
- * respects for all of the code used other than "OpenSSL".  If you modify
- * this file, you may extend this exception to your version of the file,
- * but you are not obligated to do so.  If you do not wish to do so,
- * delete this exception statement from your version.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #include <stdio.h>
@@ -42,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 
@@ -146,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();