X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Futils%2Fwirecheck.c;h=ad8c6b1dab9201277be2544b32450faa7dbfe28f;hp=d37a734c4238182809c22bd89d6657a76bc1fe11;hb=fa1bff8f6f3afb858618a563b039af3bbf46153b;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850

diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c
index d37a734..ad8c6b1 100644
--- a/lnet/utils/wirecheck.c
+++ b/lnet/utils/wirecheck.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -38,15 +34,14 @@
 #define _GNU_SOURCE
 #endif
 
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <lnet/lib-types.h>
-
-#include <string.h>
+#include <lnet/types.h>
 
 #ifndef HAVE_STRNLEN
 #define strnlen(s, i) strlen(s)
@@ -98,64 +93,64 @@ do {                                            \
 } while (0)
 
 void
-check_lnet_handle_wire (void)
+check_lnet_handle_wire(void)
 {
-        CHECK_STRUCT (lnet_handle_wire_t);
-        CHECK_MEMBER (lnet_handle_wire_t, wh_interface_cookie);
-        CHECK_MEMBER (lnet_handle_wire_t, wh_object_cookie);
+	CHECK_STRUCT(struct lnet_handle_wire);
+	CHECK_MEMBER(struct lnet_handle_wire, wh_interface_cookie);
+	CHECK_MEMBER(struct lnet_handle_wire, wh_object_cookie);
 }
 
 void
 check_lnet_magicversion (void)
 {
-        CHECK_STRUCT (lnet_magicversion_t);
-        CHECK_MEMBER (lnet_magicversion_t, magic);
-        CHECK_MEMBER (lnet_magicversion_t, version_major);
-        CHECK_MEMBER (lnet_magicversion_t, version_minor);
+	CHECK_STRUCT(struct lnet_magicversion);
+	CHECK_MEMBER(struct lnet_magicversion, magic);
+	CHECK_MEMBER(struct lnet_magicversion, version_major);
+	CHECK_MEMBER(struct lnet_magicversion, version_minor);
 }
 
 void
 check_lnet_hdr (void)
 {
-        CHECK_STRUCT (lnet_hdr_t);
-        CHECK_MEMBER (lnet_hdr_t, dest_nid);
-        CHECK_MEMBER (lnet_hdr_t, src_nid);
-        CHECK_MEMBER (lnet_hdr_t, dest_pid);
-        CHECK_MEMBER (lnet_hdr_t, src_pid);
-        CHECK_MEMBER (lnet_hdr_t, type);
-        CHECK_MEMBER (lnet_hdr_t, payload_length);
-        CHECK_MEMBER (lnet_hdr_t, msg);
+	CHECK_STRUCT(struct lnet_hdr);
+	CHECK_MEMBER(struct lnet_hdr, dest_nid);
+	CHECK_MEMBER(struct lnet_hdr, src_nid);
+	CHECK_MEMBER(struct lnet_hdr, dest_pid);
+	CHECK_MEMBER(struct lnet_hdr, src_pid);
+	CHECK_MEMBER(struct lnet_hdr, type);
+	CHECK_MEMBER(struct lnet_hdr, payload_length);
+	CHECK_MEMBER(struct lnet_hdr, msg);
 
         BLANK_LINE ();
         COMMENT ("Ack");
-        CHECK_MEMBER (lnet_hdr_t, msg.ack.dst_wmd);
-        CHECK_MEMBER (lnet_hdr_t, msg.ack.match_bits);
-        CHECK_MEMBER (lnet_hdr_t, msg.ack.mlength);
+	CHECK_MEMBER(struct lnet_hdr, msg.ack.dst_wmd);
+	CHECK_MEMBER(struct lnet_hdr, msg.ack.match_bits);
+	CHECK_MEMBER(struct lnet_hdr, msg.ack.mlength);
 
         BLANK_LINE ();
         COMMENT ("Put");
-        CHECK_MEMBER (lnet_hdr_t, msg.put.ack_wmd);
-        CHECK_MEMBER (lnet_hdr_t, msg.put.match_bits);
-        CHECK_MEMBER (lnet_hdr_t, msg.put.hdr_data);
-        CHECK_MEMBER (lnet_hdr_t, msg.put.ptl_index);
-        CHECK_MEMBER (lnet_hdr_t, msg.put.offset);
+	CHECK_MEMBER(struct lnet_hdr, msg.put.ack_wmd);
+	CHECK_MEMBER(struct lnet_hdr, msg.put.match_bits);
+	CHECK_MEMBER(struct lnet_hdr, msg.put.hdr_data);
+	CHECK_MEMBER(struct lnet_hdr, msg.put.ptl_index);
+	CHECK_MEMBER(struct lnet_hdr, msg.put.offset);
 
         BLANK_LINE ();
         COMMENT ("Get");
-        CHECK_MEMBER (lnet_hdr_t, msg.get.return_wmd);
-        CHECK_MEMBER (lnet_hdr_t, msg.get.match_bits);
-        CHECK_MEMBER (lnet_hdr_t, msg.get.ptl_index);
-        CHECK_MEMBER (lnet_hdr_t, msg.get.src_offset);
-        CHECK_MEMBER (lnet_hdr_t, msg.get.sink_length);
+	CHECK_MEMBER(struct lnet_hdr, msg.get.return_wmd);
+	CHECK_MEMBER(struct lnet_hdr, msg.get.match_bits);
+	CHECK_MEMBER(struct lnet_hdr, msg.get.ptl_index);
+	CHECK_MEMBER(struct lnet_hdr, msg.get.src_offset);
+	CHECK_MEMBER(struct lnet_hdr, msg.get.sink_length);
 
         BLANK_LINE ();
         COMMENT ("Reply");
-        CHECK_MEMBER (lnet_hdr_t, msg.reply.dst_wmd);
+	CHECK_MEMBER(struct lnet_hdr, msg.reply.dst_wmd);
 
         BLANK_LINE ();
         COMMENT ("Hello");
-        CHECK_MEMBER (lnet_hdr_t, msg.hello.incarnation);
-        CHECK_MEMBER (lnet_hdr_t, msg.hello.type);
+	CHECK_MEMBER(struct lnet_hdr, msg.hello.incarnation);
+	CHECK_MEMBER(struct lnet_hdr, msg.hello.type);
 }
 
 void