packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Fix a format string error

This commit is contained in:
Colin Walters 2012-06-27 20:25:56 -04:00
parent 671303d1ab
commit d596615bab
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ostadmin/ot-admin-main.c
View File

@ -75,7 +75,7 @@ prep_builtin_argv (const char *builtin,
static void static void
set_error_print_usage (GError **error, OtAdminBuiltin *builtins, const char *msg, char **argv) set_error_print_usage (GError **error, OtAdminBuiltin *builtins, const char *msg, char **argv)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, msg); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, msg);
usage (argv, builtins, TRUE); usage (argv, builtins, TRUE);
} }

2
src/ostree/ot-main.c
View File

@ -75,7 +75,7 @@ prep_builtin_argv (const char *builtin,
static void static void
set_error_print_usage (GError **error, OstreeBuiltin *builtins, const char *msg, char **argv) set_error_print_usage (GError **error, OstreeBuiltin *builtins, const char *msg, char **argv)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, msg); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, msg);
usage (argv, builtins, TRUE); usage (argv, builtins, TRUE);
} }

5
src/switchroot/ostree-switch-root.c
View File

@ -203,11 +203,10 @@ main(int argc, char *argv[])
for (i = 0; initramfs_move_mounts[i] != NULL; i++) for (i = 0; initramfs_move_mounts[i] != NULL; i++)
{ {
const char *path = initramfs_move_mounts[i]; const char *path = initramfs_move_mounts[i];
snprintf (srcpath, sizeof(srcpath), path);
snprintf (destpath, sizeof(destpath), "%s/ostree/%s%s", root_mountpoint, ostree_target, path); snprintf (destpath, sizeof(destpath), "%s/ostree/%s%s", root_mountpoint, ostree_target, path);
if (mount (srcpath, destpath, NULL, MS_MOVE, NULL) < 0) if (mount (path, destpath, NULL, MS_MOVE, NULL) < 0)
{ {
perrorv ("failed to move mount of %s to %s", srcpath, destpath); perrorv ("failed to move mount of %s to %s", path, destpath);
exit (1); exit (1);
} }
} }