X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Fwirecheck.c;h=95d2aa6d7044b02407d681cc7ef910336ce3da8a;hb=84a3fd67356c8073a917ea6abd63928055e38156;hp=17c57aab6a4f4c01785acb7bd91cdee92c9a9916;hpb=ba8500293ed9ec8421b17e510443d5f7cf58c997;p=fs%2Flustre-release.git

diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c
index 17c57aa..95d2aa6 100644
--- a/lnet/utils/wirecheck.c
+++ b/lnet/utils/wirecheck.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -34,6 +32,10 @@
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -193,7 +195,7 @@ system_string (char *cmdline, char *str, int len)
                     WEXITSTATUS(rc) != 0)
                         abort();
 
-                if (strlen(str) == len)
+                if (strnlen(str, len) == len)
                         str[len - 1] = 0;
 
                 if (str[strlen(str) - 1] == '\n')
@@ -223,7 +225,6 @@ main (int argc, char **argv)
 
         COMMENT ("Constants...");
 
-        CHECK_DEFINE (LNET_PROTO_OPENIB_MAGIC);
         CHECK_DEFINE (LNET_PROTO_RA_MAGIC);
 
         CHECK_DEFINE (LNET_PROTO_TCP_MAGIC);