LU-7734 lnet: remove "struct' from generated comment

The CHECK_STRUCT() generates a comment saying "Checks for struct "
followed by the type name. If the type name is 'struct mumble' the
result is "Checks for struct struct mumble". Drop the extra "struct".

Test-Parameters: trivial
Signed-off-by: Olaf Weber <olaf@sgi.com>
Change-Id: I90b13a2c500c63accb90ef567b197defd5521dea

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index 687affb..f3e2a1d 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -267,7 +267,7 @@ static void lnet_assert_wire_constants(void)
        CLASSERT((int)offsetof(struct lnet_handle_wire, wh_object_cookie) == 8);
        CLASSERT((int)sizeof(((struct lnet_handle_wire *)0)->wh_object_cookie) == 8);
 
-       /* Checks for struct lnet_magicversion_t */
+       /* Checks for lnet_magicversion_t */
        CLASSERT((int)sizeof(lnet_magicversion_t) == 8);
        CLASSERT((int)offsetof(lnet_magicversion_t, magic) == 0);
        CLASSERT((int)sizeof(((lnet_magicversion_t *)0)->magic) == 4);
@@ -276,7 +276,7 @@ static void lnet_assert_wire_constants(void)
        CLASSERT((int)offsetof(lnet_magicversion_t, version_minor) == 6);
        CLASSERT((int)sizeof(((lnet_magicversion_t *)0)->version_minor) == 2);
 
-       /* Checks for struct lnet_hdr_t */
+       /* Checks for lnet_hdr_t */
        CLASSERT((int)sizeof(lnet_hdr_t) == 72);
        CLASSERT((int)offsetof(lnet_hdr_t, dest_nid) == 0);
        CLASSERT((int)sizeof(((lnet_hdr_t *)0)->dest_nid) == 8);

diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c
index 523eb94..5d66aa1 100644 (file)
--- a/lnet/utils/wirecheck.c
+++ b/lnet/utils/wirecheck.c
@@ -88,7 +88,7 @@ do {                                          \
 #define CHECK_STRUCT(s)                                \
 do {                                           \
        BLANK_LINE();                           \
-       COMMENT("Checks for struct "#s);        \
+       COMMENT("Checks for "#s);               \
        CHECK_VALUE((int)sizeof(s));            \
 } while (0)