ocfs2-tools-format.patch

   1 --- ocfs2-tools-1.4.4/fsck.ocfs2/problem.c.orig 2008-12-03 19:38:21.000000000 +0100
   2 +++ ocfs2-tools-1.4.4/fsck.ocfs2/problem.c      2015-12-13 18:22:46.957121947 +0100
   3 @@ -112,9 +112,9 @@
   4                 ans = ost->ost_answer ? 'y' : 'n';
   5         } else {
   6                 if (flags & PY)
   7 -                       printf(yes);
   8 +                       fputs(yes, stdout);
   9                 else if (flags & PN)
  10 -                       printf(no);
  11 +                       fputs(no, stdout);
  12         }
  13
  14         fflush(stdout);
  15 --- ocfs2-tools-1.4.4/tunefs.ocfs2/op_query.c.orig      2009-04-14 00:10:40.000000000 +0200
  16 +++ ocfs2-tools-1.4.4/tunefs.ocfs2/op_query.c   2015-12-13 18:47:05.127060750 +0100
  17 @@ -150,7 +150,7 @@
  18  {
  19         char label[OCFS2_MAX_VOL_LABEL_LEN + 1];
  20
  21 -       snprintf(label, OCFS2_MAX_VOL_LABEL_LEN + 1,
  22 +       snprintf(label, OCFS2_MAX_VOL_LABEL_LEN + 1, "%s",
  23                  (char *)OCFS2_RAW_SB(query_fs->fs_super)->s_label);
  24
  25         return print_string(stream, info, args, label);
  26 @@ -338,7 +338,7 @@
  27         register_printf_function('O', handle_ro_compat, handle_arginfo);
  28
  29         query_fs = fs;
  30 -       fprintf(stdout, fmt);
  31 +       fprintf(stdout, fmt, NULL /* hack */);
  32         query_fs = NULL;
  33
  34         ocfs2_free(&fmt);
  35 --- ocfs2-tools-1.4.4/debugfs.ocfs2/commands.c.orig     2010-03-17 01:10:43.000000000 +0100
  36 +++ ocfs2-tools-1.4.4/debugfs.ocfs2/commands.c  2015-12-13 19:23:59.780301145 +0100
  37 @@ -677,7 +677,7 @@
  38         gbls.cwd = strdup("/");
  39
  40         /* lookup heartbeat file */
  41 -       snprintf (sysfile, sizeof(sysfile),
  42 +       snprintf (sysfile, sizeof(sysfile), "%s",
  43                   ocfs2_system_inodes[HEARTBEAT_SYSTEM_INODE].si_name);
  44         ret = ocfs2_lookup(gbls.fs, gbls.sysdir_blkno, sysfile,
  45                            strlen(sysfile), NULL, &gbls.hb_blkno);
  46 @@ -685,7 +685,7 @@
  47                 gbls.hb_blkno = 0;
  48
  49         /* lookup slotmap file */
  50 -       snprintf (sysfile, sizeof(sysfile),
  51 +       snprintf (sysfile, sizeof(sysfile), "%s",
  52                   ocfs2_system_inodes[SLOT_MAP_SYSTEM_INODE].si_name);
  53         ret = ocfs2_lookup(gbls.fs, gbls.sysdir_blkno, sysfile,
  54                            strlen(sysfile), NULL, &gbls.slotmap_blkno);
  55 --- ocfs2-tools-1.4.4/debugfs.ocfs2/find_block_inode.c.orig     2010-03-11 20:29:36.000000000 +0100
  56 +++ ocfs2-tools-1.4.4/debugfs.ocfs2/find_block_inode.c  2015-12-13 19:24:25.760300055 +0100
  57 @@ -203,7 +203,7 @@
  58         char sysfile[50];
  59         errcode_t ret = 0;
  60
  61 -       snprintf(sysfile, sizeof(sysfile),
  62 +       snprintf(sysfile, sizeof(sysfile), "%s",
  63                  ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
  64
  65         ret = ocfs2_lookup(fs, fs->fs_sysdir_blkno, sysfile,
  66 --- ocfs2-tools-1.4.4/mount.ocfs2/mount.ocfs2.c.orig    2015-12-13 17:42:28.663890097 +0100
  67 +++ ocfs2-tools-1.4.4/mount.ocfs2/mount.ocfs2.c 2015-12-13 19:25:34.140297185 +0100
  68 @@ -185,7 +185,7 @@
  69         }
  70
  71         if (mo->type && strcmp(mo->type, OCFS2_FS_NAME)) {
  72 -               com_err(progname, OCFS2_ET_UNKNOWN_FILESYSTEM, mo->type);
  73 +               com_err(progname, OCFS2_ET_UNKNOWN_FILESYSTEM, "%s", mo->type);
  74                 return -1;
  75         }
  76
  77 --- ocfs2-tools-1.4.4/fswreck/corrupt.c.orig    2010-03-17 01:11:06.000000000 +0100
  78 +++ ocfs2-tools-1.4.4/fswreck/corrupt.c 2015-12-13 19:27:51.333624758 +0100
  79 @@ -49,7 +49,7 @@
  80         case 10:
  81         case 11:
  82         case 12:
  83 -               snprintf(sysfile, sizeof(sysfile),
  84 +               snprintf(sysfile, sizeof(sysfile), "%s",
  85                          ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
  86                 break;
  87  #ifdef _LATER_
  88 --- ocfs2-tools-1.4.4/fswreck/chain.c.orig      2010-02-25 03:06:23.000000000 +0100
  89 +++ ocfs2-tools-1.4.4/fswreck/chain.c   2015-12-13 19:28:24.540290032 +0100
  90 @@ -345,7 +345,7 @@
  91         struct ocfs2_super_block *sb = OCFS2_RAW_SB(fs->fs_super);
  92
  93         if (slotnum == UINT16_MAX)
  94 -               snprintf(sysfile, sizeof(sysfile),
  95 +               snprintf(sysfile, sizeof(sysfile), "%s",
  96                 ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
  97         else
  98                 snprintf(sysfile, sizeof(sysfile),
  99 @@ -401,7 +401,7 @@
 100         uint64_t blkno;
 101         struct ocfs2_super_block *sb = OCFS2_RAW_SB(fs->fs_super);
 102
 103 -       snprintf(sysfile, sizeof(sysfile),
 104 +       snprintf(sysfile, sizeof(sysfile), "%s",
 105                  ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
 106
 107         ret = ocfs2_lookup(fs, sb->s_system_dir_blkno, sysfile,
 108 --- ocfs2-tools-1.4.4/fswreck/group.c.orig      2010-02-25 03:06:24.000000000 +0100
 109 +++ ocfs2-tools-1.4.4/fswreck/group.c   2015-12-13 19:29:30.580287261 +0100
 110 @@ -214,7 +214,7 @@
 111         struct ocfs2_super_block *sb = OCFS2_RAW_SB(fs->fs_super);
 112
 113         if (slotnum == UINT16_MAX)
 114 -               snprintf(sysfile, sizeof(sysfile),
 115 +               snprintf(sysfile, sizeof(sysfile), "%s",
 116                 ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
 117         else
 118                 snprintf(sysfile, sizeof(sysfile),