installer: Add __printflike()s and fix resulting format warnings.

diff --git a/usr.sbin/installer/dfuibe_installer/fn_configure.c b/usr.sbin/installer/dfuibe_installer/fn_configure.c
index 9fc722e..7fdd521 100644 (file)
--- a/usr.sbin/installer/dfuibe_installer/fn_configure.c
+++ b/usr.sbin/installer/dfuibe_installer/fn_configure.c
@@ -684,8 +684,8 @@ fn_set_timezone(struct i_fn_args *a)
 
         switch (dfui_be_present_dialog(a->c, _("Local or UTC (Greenwich Mean Time) clock"),
            _("Yes|No"),
-            _("Is this machine's CMOS clock set to UTC?\n"),
-           _("If it is set to local time, or you don't know, please choose NO here!"))) {
+            _("Is this machine's CMOS clock set to UTC?\n\n"
+           "If it is set to local time, or you don't know, please choose NO here!"))) {
                case 1:
                        cmds = commands_new();
                        command_add(cmds, "%s%s %s%setc/wall_cmos_clock",
@@ -1272,7 +1272,7 @@ mount_target_system(struct i_fn_args *a)
                    a->os_root, cmd_name(a, "MOUNT"),
                    a->os_root,
                    subpartition_get_device_name(a_subpart),
-                   a->os_root, a->cfg_root);
+                   a->os_root);
                command_add(cmds,
                    "%s%s %sdev/`%s%s \"^vfs\\.root\\.mountfrom\" %sboot/loader.conf |"
                    "%s%s -Fhammer: '{print $2;}' |"
@@ -1286,7 +1286,7 @@ mount_target_system(struct i_fn_args *a)
                    a->os_root, a->cfg_root);
                command_add(cmds, "%s%s %sboot",
                    a->os_root, cmd_name(a, "UMOUNT"),
-                   a->os_root, a->cfg_root);
+                   a->os_root);
        }
        if (!commands_execute(a, cmds)) {
                commands_free(cmds);

diff --git a/usr.sbin/installer/dfuibe_installer/fn_disk.c b/usr.sbin/installer/dfuibe_installer/fn_disk.c
index 2d0999e..7a2c157 100644 (file)
--- a/usr.sbin/installer/dfuibe_installer/fn_disk.c
+++ b/usr.sbin/installer/dfuibe_installer/fn_disk.c
@@ -377,7 +377,7 @@ ask_to_wipe_boot_sector(struct i_fn_args *a, struct commands *fcmds)
                            "then try installing the bootblock again. "
                            "Note that this should not affect the "
                            "partition table of the disk."),
-                           disk, disk)) {
+                           disk)) {
                        case 1:
                                cmds = commands_new();
                                command_add(cmds,

diff --git a/usr.sbin/installer/dfuibe_installer/fn_install.c b/usr.sbin/installer/dfuibe_installer/fn_install.c
index 7651d37..a9cf268 100644 (file)
--- a/usr.sbin/installer/dfuibe_installer/fn_install.c
+++ b/usr.sbin/installer/dfuibe_installer/fn_install.c
@@ -604,9 +604,9 @@ fn_install_os(struct i_fn_args *a)
            a->os_root, cmd_name(a, "CHMOD"), a->os_root);
 
        /* Customize stuff here */
-       if(is_file("%susr/local/bin/after_installation_routines.sh")) {
+       if(is_file("%susr/local/bin/after_installation_routines.sh", a->os_root)) {
                command_add(cmds, "%susr/local/bin/after_installation_routines.sh",
-               a->os_root, _("Running after installation custom routines..."));
+                   a->os_root);
        }
 
        /*

diff --git a/usr.sbin/installer/dfuibe_installer/fn_subpart_hammer.c b/usr.sbin/installer/dfuibe_installer/fn_subpart_hammer.c
index a62abfa..c9a61cd 100644 (file)
--- a/usr.sbin/installer/dfuibe_installer/fn_subpart_hammer.c
+++ b/usr.sbin/installer/dfuibe_installer/fn_subpart_hammer.c
@@ -306,9 +306,9 @@ check_capacity(struct i_fn_args *a)
 
        if (total_capacity > slice_get_capacity(storage_get_selected_slice(a->s))) {
                inform(a->c, _("The space allocated to all of your selected "
-                   "subpartitions (%dM) exceeds the total "
+                   "subpartitions (%luM) exceeds the total "
                    "capacity of the selected primary partition "
-                   "(%dM). Remove some subpartitions or choose "
+                   "(%luM). Remove some subpartitions or choose "
                    "a smaller size for them and try again."),
                    total_capacity, slice_get_capacity(storage_get_selected_slice(a->s)));
                return(0);

diff --git a/usr.sbin/installer/dfuibe_installer/fn_subpart_ufs.c b/usr.sbin/installer/dfuibe_installer/fn_subpart_ufs.c
index 288f03c..ea1ca4a 100644 (file)
--- a/usr.sbin/installer/dfuibe_installer/fn_subpart_ufs.c
+++ b/usr.sbin/installer/dfuibe_installer/fn_subpart_ufs.c
@@ -301,9 +301,9 @@ check_capacity(struct i_fn_args *a)
 
        if (total_capacity > slice_get_capacity(storage_get_selected_slice(a->s))) {
                inform(a->c, _("The space allocated to all of your selected "
-                   "subpartitions (%dM) exceeds the total "
+                   "subpartitions (%luM) exceeds the total "
                    "capacity of the selected primary partition "
-                   "(%dM). Remove some subpartitions or choose "
+                   "(%luM). Remove some subpartitions or choose "
                    "a smaller size for them and try again."),
                    total_capacity, slice_get_capacity(storage_get_selected_slice(a->s)));
                return(0);

diff --git a/usr.sbin/installer/libaura/buffer.h b/usr.sbin/installer/libaura/buffer.h
index a7404d3..5d1a603 100644 (file)
--- a/usr.sbin/installer/libaura/buffer.h
+++ b/usr.sbin/installer/libaura/buffer.h
@@ -61,8 +61,10 @@ void                  aura_buffer_append(struct aura_buffer *, const char *, size_t);
 
 void                    aura_buffer_cpy(struct aura_buffer *, const char *);
 void                    aura_buffer_cat(struct aura_buffer *, const char *);
-int                     aura_buffer_cat_file(struct aura_buffer *, const char *, ...);
-int                     aura_buffer_cat_pipe(struct aura_buffer *, const char *, ...);
+int                     aura_buffer_cat_file(struct aura_buffer *, const char *, ...)
+                            __printflike(2, 3);
+int                     aura_buffer_cat_pipe(struct aura_buffer *, const char *, ...)
+                            __printflike(2, 3);
 
 int                     aura_buffer_seek(struct aura_buffer *, size_t);
 size_t                  aura_buffer_tell(struct aura_buffer *);

diff --git a/usr.sbin/installer/libaura/fspred.h b/usr.sbin/installer/libaura/fspred.h
index 6d74edc..99ae6eb 100644 (file)
--- a/usr.sbin/installer/libaura/fspred.h
+++ b/usr.sbin/installer/libaura/fspred.h
@@ -41,11 +41,11 @@
 
 /*** PROTOTYPES ***/
 
-int                     is_dir(const char *, ...);
-int                     is_file(const char *, ...);
-int                     is_program(const char *, ...);
-int                     is_device(const char *, ...);
-int                     is_named_pipe(const char *, ...);
+int                     is_dir(const char *, ...) __printflike(1, 2);
+int                     is_file(const char *, ...) __printflike(1, 2);
+int                     is_program(const char *, ...) __printflike(1, 2);
+int                     is_device(const char *, ...) __printflike(1, 2);
+int                     is_named_pipe(const char *, ...) __printflike(1, 2);
 int                     is_mountpoint_mounted(const char *);
 int                     is_device_mounted(const char *);
 int                     is_any_slice_mounted(const char *);

diff --git a/usr.sbin/installer/libaura/popen.h b/usr.sbin/installer/libaura/popen.h
index 67a30d7..aadb6bf 100644 (file)
--- a/usr.sbin/installer/libaura/popen.h
+++ b/usr.sbin/installer/libaura/popen.h
@@ -53,7 +53,8 @@
 #define        AURA_PGETS_EOF          3
 #define        AURA_PGETS_FGETS_ERR    4
 
-FILE                   *aura_popen(const char *, const char *, ...);
+FILE                   *aura_popen(const char *, const char *, ...)
+                            __printflike(1, 3);
 int                     aura_pclose(FILE *);
 pid_t                   aura_pgetpid(FILE *);
 int                     aura_pgets(FILE *, char *, size_t, long, int *);

diff --git a/usr.sbin/installer/libdfui/dfui.h b/usr.sbin/installer/libdfui/dfui.h
index 06b28d1..d161709 100644 (file)
--- a/usr.sbin/installer/libdfui/dfui.h
+++ b/usr.sbin/installer/libdfui/dfui.h
@@ -372,7 +372,8 @@ void                         dfui_connection_free(struct dfui_connection *);
  */
 
 int                     dfui_be_present_dialog(struct dfui_connection *,
-                                               const char *, const char *, const char *, ...);
+                            const char *, const char *, const char *, ...)
+                            __printflike(4, 5);
 
 /*
  * BACKEND HIGH LEVEL INTERFACE

diff --git a/usr.sbin/installer/libdfui/lang.c b/usr.sbin/installer/libdfui/lang.c
index 9aba272..e71bf2d 100644 (file)
--- a/usr.sbin/installer/libdfui/lang.c
+++ b/usr.sbin/installer/libdfui/lang.c
@@ -28,7 +28,7 @@ struct _langset {
 #define langcount (sizeof(langset) / sizeof(struct _langset))
 
 static int     get_lang_num(const char *langname);
-static int     system_fmt(const char *fmt, ...);
+static int     system_fmt(const char *fmt, ...) __printflike(1, 2);
 
 
 static int

diff --git a/usr.sbin/installer/libinstaller/commands.h b/usr.sbin/installer/libinstaller/commands.h
index 3adec0a..ae41428 100644 (file)
--- a/usr.sbin/installer/libinstaller/commands.h
+++ b/usr.sbin/installer/libinstaller/commands.h
@@ -90,12 +90,15 @@ struct command {
 /*** PROTOTYPES ***/
 
 struct commands        *commands_new(void);
-struct command *command_add(struct commands *, const char *, ...);
+struct command *command_add(struct commands *, const char *, ...)
+                    __printflike(2, 3);
 
 void            command_set_log_mode(struct command *, int);
 void            command_set_failure_mode(struct command *, int);
-void            command_set_desc(struct command *, const char *, ...);
-void            command_set_tag(struct command *, const char *, ...);
+void            command_set_desc(struct command *, const char *, ...)
+                    __printflike(2, 3);
+void            command_set_tag(struct command *, const char *, ...)
+                    __printflike(2, 3);
 
 struct command *command_get_first(const struct commands *);
 struct command *command_get_next(const struct command *);
@@ -114,6 +117,6 @@ void                 view_command_log(struct i_fn_args *);
 /* Command Generators */
 
 void            unmount_all_under(struct i_fn_args *, struct commands *,
-                                  const char *, ...);
+                    const char *, ...) __printflike(3, 4);
 
 #endif /* !__COMMANDS_H_ */

diff --git a/usr.sbin/installer/libinstaller/confed.h b/usr.sbin/installer/libinstaller/confed.h
index 2108345..2d3199c 100644 (file)
--- a/usr.sbin/installer/libinstaller/confed.h
+++ b/usr.sbin/installer/libinstaller/confed.h
@@ -55,9 +55,9 @@ void                   config_vars_free(struct config_vars *);
 int                     config_var_set(struct config_vars *, const char *, const char *);
 const char             *config_var_get(const struct config_vars *, const char *);
 int                     config_vars_write(const struct config_vars *, int,
-                                          const char *, ...);
+                            const char *, ...) __printflike(3, 4);
 int                     config_vars_read(struct i_fn_args *,
-                                         struct config_vars *, int,
-                                         const char *, ...);
+                            struct config_vars *, int, const char *, ...)
+                            __printflike(4, 5);
 
 #endif /* !__CONFED_H_ */

diff --git a/usr.sbin/installer/libinstaller/diskutil.h b/usr.sbin/installer/libinstaller/diskutil.h
index e9405c8..b88ead5 100644 (file)
--- a/usr.sbin/installer/libinstaller/diskutil.h
+++ b/usr.sbin/installer/libinstaller/diskutil.h
@@ -161,8 +161,10 @@ struct subpartition        *subpartition_new(struct slice *, const char *, long,
                                          int, long, long, int);
 struct subpartition    *subpartition_new_hammer(struct slice *, const char *, long);
 int                     subpartition_count(const struct slice *);
-struct subpartition    *subpartition_find(const struct slice *, const char *, ...);
-struct subpartition    *subpartition_of(const struct slice *, const char *, ...);
+struct subpartition    *subpartition_find(const struct slice *, const char *, ...)
+                            __printflike(2, 3);
+struct subpartition    *subpartition_of(const struct slice *, const char *, ...)
+                            __printflike(2, 3);
 struct subpartition    *subpartition_find_capacity(const struct slice *, long);
 void                    subpartitions_free(struct slice *);
 struct subpartition    *subpartition_next(const struct subpartition *);

diff --git a/usr.sbin/installer/libinstaller/functions.h b/usr.sbin/installer/libinstaller/functions.h
index c922966..2148dcc 100644 (file)
--- a/usr.sbin/installer/libinstaller/functions.h
+++ b/usr.sbin/installer/libinstaller/functions.h
@@ -76,7 +76,8 @@ struct i_fn_args {
 struct i_fn_args *i_fn_args_new(const char *, const char *, int, const char *);
 void            i_fn_args_free(struct i_fn_args *);
 
-void            i_log(struct i_fn_args *, const char *, ...);
+void            i_log(struct i_fn_args *, const char *, ...)
+                    __printflike(2, 3);
 
 /* General Utilities */
 

diff --git a/usr.sbin/installer/libinstaller/uiutil.h b/usr.sbin/installer/libinstaller/uiutil.h
index f7f9a95..1eba696 100644 (file)
--- a/usr.sbin/installer/libinstaller/uiutil.h
+++ b/usr.sbin/installer/libinstaller/uiutil.h
@@ -41,7 +41,9 @@
 #ifndef __UIUTIL_H_
 #define __UIUTIL_H_
 
-void           inform(struct dfui_connection *, const char *, ...);
-int            confirm_dangerous_action(struct dfui_connection *, const char *, ...);
+void           inform(struct dfui_connection *, const char *, ...)
+                   __printflike(2, 3);
+int            confirm_dangerous_action(struct dfui_connection *, const char *, ...)
+                   __printflike(2, 3);
 
 #endif /* !__UIUTIL_H_ */