1 files changed, 51 insertions, 47 deletions
diff --git a/tests/basic/gfapi/libgfapi-fini-hang.c b/tests/basic/gfapi/libgfapi-fini-hang.c
index ee16bd7ce58..37800e3188b 100644
--- a/tests/basic/gfapi/libgfapi-fini-hang.c
+++ b/tests/basic/gfapi/libgfapi-fini-hang.c
@@ -2,57 +2,61 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <alloca.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "api/glfs.h"
-#include "api/glfs-handles.h"
-
-#define LOG_ERR(func, ret) do { \
-        if (ret != 0) {            \
-                fprintf (stderr, "%s : returned error %d\n", func, ret); \
-                exit(1); \
-        } else { \
-                fprintf (stderr, "%s : returned %d\n", func, ret); \
-        } \
-} while (0)
+#include <glusterfs/api/glfs.h>
+#include <glusterfs/api/glfs-handles.h>
+
+#define LOG_ERR(func, ret)                                                     \
+    do {                                                                       \
+        if (ret != 0) {                                                        \
+            fprintf(stderr, "%s : returned error %d\n", func, ret);            \
+            exit(1);                                                           \
+        } else {                                                               \
+            fprintf(stderr, "%s : returned %d\n", func, ret);                  \
+        }                                                                      \
+    } while (0)
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        glfs_t    *fs = NULL;
-        int        ret = 0, i;
-        glfs_fd_t *fd = NULL;
-        char       readbuf[32];
-        char      *filename = "a1";
-
-        fprintf (stderr, "Starting libgfapi_fini\n");
-
-        if (argc < 2) {
-                fprintf (stderr, "Invalid argument\n");
-                exit(1);
-        }
-
-        fs = glfs_new (argv[1]);
-        if (!fs) {
-                fprintf (stderr, "glfs_new: returned NULL\n");
-                exit(1);
-        }
-
-        ret = glfs_set_volfile_server (fs, "tcp", "localhost", 0);
-        LOG_ERR("glfs_set_volfile_server", ret);
-
-        ret = glfs_set_logging (fs, "/dev/stderr", 7);
-        LOG_ERR("glfs_set_logging", ret);
-
-        /* Do not call glfs_init.
-         * glfs_fini() shouldn't hang in that case*/
-        ret = glfs_fini(fs);
-        LOG_ERR("glfs_fini", ret);
-        fprintf (stderr, "End of libgfapi_fini\n");
-
-        exit(0);
+    glfs_t *fs = NULL;
+    int ret = 0, i;
+    glfs_fd_t *fd = NULL;
+    char readbuf[32];
+    char *logname = NULL;
+    char *hostname = NULL;
+    char *volname = NULL;
+
+    fprintf(stderr, "Starting libgfapi_fini\n");
+
+    if (argc < 4) {
+        fprintf(stderr, "Invalid argument\n");
+        exit(1);
+    }
+
+    hostname = argv[1];
+    volname = argv[2];
+    logname = argv[3];
+
+    fs = glfs_new(volname);
+    if (!fs) {
+        fprintf(stderr, "glfs_new: returned NULL\n");
+        exit(1);
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", hostname, 0);
+    LOG_ERR("glfs_set_volfile_server", ret);
+
+    ret = glfs_set_logging(fs, logname, 7);
+    LOG_ERR("glfs_set_logging", ret);
+
+    /* Do not call glfs_init.
+     * glfs_fini() shouldn't hang in that case*/
+    ret = glfs_fini(fs);
+    LOG_ERR("glfs_fini", ret);
+    fprintf(stderr, "End of libgfapi_fini\n");
+
+    exit(0);
 }
-
-