Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 11 Jul 2009 19:01:40 +0000 (21:01 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 11 Jul 2009 19:01:40 +0000 (21:01 +0200)
1  2 
afs.c
aft.c
attribute.c
blob.c

diff --cc afs.c
--- 1/afs.c
--- 2/afs.c
+++ b/afs.c
@@@ -1019,15 -1089,14 +1020,14 @@@ static void create_tables_callback(int 
        }
        ret = open_afs_tables();
  out:
-       if (ret >= 0)
-               buf = make_message("successfully created afs table(s)\n");
-       else
-               buf = make_message("%s\n", para_strerror(-ret));
-       pass_buffer_as_shm(buf, strlen(buf), &fd);
-       free(buf);
+       if (ret < 0)
+               para_printf(&pb, "%s\n", para_strerror(-ret));
+       if (pb.buf)
+               pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+       free(pb.buf);
  }
  
 -int com_init(int fd, int argc, char * const * const argv)
 +int com_init(struct rc4_context *rc4c, int argc, char * const * const argv)
  {
        int i, j, ret;
        uint32_t table_mask = (1 << (NUM_AFS_TABLES + 1)) - 1;
diff --cc aft.c
Simple merge
diff --cc attribute.c
Simple merge
diff --cc blob.c
Simple merge