b=21636 diagnostic patch to detect request delay send/reply

[fs/lustre-release.git] / libsysio / tests / test_path.c

diff --git a/libsysio/tests/test_path.c b/libsysio/tests/test_path.c
index a7469b3..8776b6e 100644 (file)
--- a/libsysio/tests/test_path.c
+++ b/libsysio/tests/test_path.c
@@ -44,21 +44,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef REDSTORM
-#include <getopt.h>
-#else
-#include <unistd.h>
-#endif
 #include <errno.h>
-
-#include <assert.h>
-#include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
+#include <sys/uio.h>
+#include <getopt.h>
 
+#if defined(SYSIO_LABEL_NAMES)
 #include "sysio.h"
-#include "mount.h"
-
+#endif
+#include "xtio.h"
 #include "test.h"
 
 /*
@@ -138,7 +134,7 @@ main(int argc, char *const argv[])
        /*
         * Clean up.
         */
-       _sysio_shutdown();
+       _test_sysio_shutdown();
 
        return 0;
 }
@@ -155,7 +151,7 @@ statit(const char *path)
        /*
         * Get file attrs.
         */
-       err = lstat(path, &stbuf);
+       err = SYSIO_INTERFACE_NAME(lstat)(path, &stbuf);
        if (err) {
                perror(path);
                return -1;
@@ -203,7 +199,7 @@ statit(const char *path)
         * Print path and type.
         */
        if (S_ISLNK(stbuf.st_mode)) {
-               cc = readlink(path, buf, sizeof(buf));
+               cc = SYSIO_INTERFACE_NAME(readlink)(path, buf, sizeof(buf));
                if (cc < 0) {
                        perror(path);
                        return -1;
@@ -211,7 +207,7 @@ statit(const char *path)
        }
        (void )printf("%s: %c", path, t);
        if (S_ISLNK(stbuf.st_mode) && (size_t )cc < sizeof(buf))
-               (void )printf(" %.*s", cc, buf);
+               (void )printf(" %.*s", (int )cc, buf);
        (void )putchar('\n');
 
        return 0;