[Libsysio-commit] HEAD: libsysio/tests sysio_stubs.c sysio_tests.c test_driver.c test_mounts.c

[Sonja T. <so...@us...>]

Update of /cvsroot/libsysio/libsysio/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv3710/tests

Modified Files:
	sysio_stubs.c sysio_tests.c test_driver.c test_mounts.c 
Log Message:
Fix compile warnings


Index: sysio_stubs.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/sysio_stubs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -b -B -p -r1.6 -r1.7
--- sysio_stubs.c	28 Oct 2003 20:59:39 -0000	1.6
+++ sysio_stubs.c	21 Jan 2004 15:38:45 -0000	1.7
@@ -241,14 +241,14 @@ int test_do_printbuf(int argc, char **ar
     index = mobj->obj;
 
     buf_st = buflist[index];
-    DBG(2, fprintf(outfp, "buf_st is %x:\n", buf_st));
+    DBG(2, fprintf(outfp, "buf_st is %p:\n", buf_st));
     buf = buf_st->buf;
     DBG(2, fprintf(outfp, "buf %s:\n", argv[0]));
     if (mobj->type == STR) {
       sprintf(output, "\n%s", (char *)buf);
      } else {
        sprintf(output,"%s\n", output);
-       DBG(2, fprintf(outfp, "buf_st->len is %d, buf is %x\n", buf_st->len, buf));
+       DBG(2, fprintf(outfp, "buf_st->len is %d, buf is %p\n", buf_st->len, buf));
        if (argc == 1) {
 	 for (i = 0; i < buf_st->len/4; i++) 
 	   DBG(2, fprintf(outfp, "%#x ", ((int *)buf)[i]));

Index: sysio_tests.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/sysio_tests.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -b -B -p -r1.3 -r1.4
--- sysio_tests.c	10 Oct 2003 18:50:31 -0000	1.3
+++ sysio_tests.c	21 Jan 2004 15:38:45 -0000	1.4
@@ -268,7 +268,6 @@ out:
 
 int sysio_chdir(char *newdir) 
 {
-  char *buf;
 
   if (chdir(newdir) != 0) {
     my_perror(newdir);
@@ -744,12 +743,6 @@ int sysio_getdirentries(int fd, char *bu
 		     (unsigned long long )dp->d_off,
 		     dp->d_reclen,
 		    (char )dp->d_type));
-      DBG(3, fprintf(outfp, "\t%s: ino %x off %x len %x type %x\n",
-		     dp->d_name,
-		     (unsigned long long )dp->d_ino,
-		     (unsigned long long )dp->d_off,
-		     dp->d_reclen,
-		    (char )dp->d_type));
       err -= dp->d_reclen;
       dp = (void *)dp + dp->d_reclen;
   }

Index: test_driver.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/test_driver.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -b -B -p -r1.4 -r1.5
--- test_driver.c	28 Oct 2003 20:59:39 -0000	1.4
+++ test_driver.c	21 Jan 2004 15:38:45 -0000	1.5
@@ -118,7 +118,7 @@ void * alloc_buff32(unsigned int size, i
 {
   void* buf;
   long buf_ptr;
-  int err;
+
   /*
   if ((err = memalign(&buf, align, size)) != 0) {
     perror("memalign");
@@ -145,10 +145,14 @@ long alloc_buff64(unsigned int size, int
   char * buf;
   long ret_value;
 
+  /*  
   if (memalign((void **)&buf, align, size))
     return 0;
-
-  ret_value = (long)buf;
+  */
+  size += align;
+  buf = malloc(size);
+  align--;
+  ret_value = (long)buf  + ((long)buf & align);
   return ret_value;
 }
 
@@ -230,7 +234,7 @@ int get_obj(char *var_name) 
    * Check for '|', indicates that one or more values are or'd
    * together
    */
-  for (i=0; i < strlen(var_name); i++) {
+  for (i=0; (unsigned int)i < strlen(var_name); i++) {
     if (var_name[i] == '|') {
       char *str1 = malloc(i+1);
       char *str2 = malloc(strlen(var_name)-i+1);

Index: test_mounts.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/test_mounts.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -b -B -p -r1.5 -r1.6
--- test_mounts.c	10 Oct 2003 18:50:31 -0000	1.5
+++ test_mounts.c	21 Jan 2004 15:38:45 -0000	1.6
@@ -436,7 +436,7 @@ mountit(const char *arg)
 	/*
 	 * Eat leading white.
 	 */
-	while (*s && *s == ' ' || *s == '\t')
+	while (*s && ((*s == ' ') || (*s == '\t')))
 		s++;
 	/*
 	 * Get opts.
@@ -456,7 +456,7 @@ mountit(const char *arg)
 	/*
 	 * Eat leading white.
 	 */
-	while (*s && *s == ' ' || *s == '\t')
+	while (*s && ((*s == ' ') || (*s == '\t')))
 		s++;
 	/*
 	 * Get target
@@ -471,7 +471,7 @@ mountit(const char *arg)
 	if (*cp)
 		*cp++ = '\0';
 
-	err = mkdir(target, "0777");
+	err = mkdir(target, 0777);
 	if (err && errno != EEXIST)
 		perror(target);
 	err = mount(source, target, fstype, 0, opts);