Update dmapi test suite, add Makefiles, remove Conscript files.

[xfstests-dev.git] / dmapi / src / simple / dm_getall_tokens.c

diff --git a/dmapi/src/simple/dm_getall_tokens.c b/dmapi/src/simple/dm_getall_tokens.c
index 87dd301d9486a67b64345e62f86300ec1b96d11e..f091a57569600830953ed61b5c715c3c6d0e45ac 100644 (file)
--- a/dmapi/src/simple/dm_getall_tokens.c
+++ b/dmapi/src/simple/dm_getall_tokens.c
@@ -33,12 +33,17 @@
 #include <stdlib.h>
 #include <sys/errno.h>
 #include <malloc.h>
-#include <linux/dmapi_kern.h>
+#ifdef linux
+#include <dmapi.h>
+#include <getopt.h>
+#else
+#include <sys/dmi.h>
+#endif
 
+int
 main( int argc, char **argv )
 {
        extern char *optarg;
-       extern int optind;
        int c;
        int ret;
        dm_token_t *tokenbuf;
@@ -81,7 +86,8 @@ main( int argc, char **argv )
 
        printf("tokens=\"");
        for( i = 0; i < rnelem; i++ ){
-               printf("%d ", tokenbuf+i);
+               printf("%d ", (int)(tokenbuf+i));
        }
        printf("\"\n");
+       exit(0);
 }