Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

message const poisoning, and conversion from integers to an opaque

Browse Source 
message type.
This commit is contained in:
cgd 1999-07-04 21:32:48 +00:00
parent a70b70f98d
commit 1904092f06
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
distrib/utils/sysinst/defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: defs.h,v 1.45 1999/06/22 06:57:00 cgd Exp $ */ /* $NetBSD: defs.h,v 1.46 1999/07/04 21:32:48 cgd Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -43,6 +43,8 @@
#define FSTYPENAMES #define FSTYPENAMES
#include <sys/disklabel.h> #include <sys/disklabel.h>
#include "msg_defs.h"
/* Define for external varible use */ /* Define for external varible use */
#ifdef MAIN #ifdef MAIN
#define EXTERN #define EXTERN
@ -95,8 +97,8 @@ EXTERN int ttysig_ignore;
EXTERN pid_t ttysig_forward; EXTERN pid_t ttysig_forward;
EXTERN int layoutkind; EXTERN int layoutkind;
EXTERN int sizemult INIT(1); EXTERN int sizemult INIT(1);
EXTERN char *multname; EXTERN const char *multname;
EXTERN char *doingwhat; EXTERN const char *doingwhat;
/* loging variables */ /* loging variables */
@ -248,8 +250,8 @@ int savenewlabel __P((partinfo *lp, int nparts));
int incorelabel __P((const char *dkname, partinfo *lp)); int incorelabel __P((const char *dkname, partinfo *lp));
int edit_and_check_label __P((partinfo *lp, int nparts, int edit_and_check_label __P((partinfo *lp, int nparts,
int rawpart, int bsdpart)); int rawpart, int bsdpart));
int getpartoff __P((int msg_no, int partstart)); int getpartoff __P((msg msg_no, int partstart));
int getpartsize __P((int msg_no, int partstart, int defpartsize)); int getpartsize __P((msg msg_no, int partstart, int defpartsize));
/* from install.c */ /* from install.c */
void do_install __P((void)); void do_install __P((void));
@ -272,7 +274,7 @@ void mnt_net_config __P((void));
/* From run.c */ /* From run.c */
int collect __P((int kind, char **buffer, const char *name, ...)); int collect __P((int kind, char **buffer, const char *name, ...));
int run_prog __P((int, int, char *, char *, ...)); int run_prog __P((int, int, const char *, const char *, ...));
void do_logging __P((void)); void do_logging __P((void));
int do_system __P((const char *)); int do_system __P((const char *));
@ -298,7 +300,7 @@ void toggle_getit __P((int));
void show_cur_distsets __P((void)); void show_cur_distsets __P((void));
void make_ramdisk_dir __P((const char *path)); void make_ramdisk_dir __P((const char *path));
void ask_verbose_dist __P((void)); void ask_verbose_dist __P((void));
int get_and_unpack_sets(int success_msg, int failure_msg); int get_and_unpack_sets(msg success_msg, msg failure_msg);
int sanity_check __P((void)); int sanity_check __P((void));
/* from target.c */ /* from target.c */

8
distrib/utils/sysinst/label.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: label.c,v 1.12 1999/06/20 06:08:14 cgd Exp $ */ /* $NetBSD: label.c,v 1.13 1999/07/04 21:32:48 cgd Exp $ */
/* /*
* Copyright 1997 Jonathan Stone * Copyright 1997 Jonathan Stone
@ -36,7 +36,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: label.c,v 1.12 1999/06/20 06:08:14 cgd Exp $"); __RCSID("$NetBSD: label.c,v 1.13 1999/07/04 21:32:48 cgd Exp $");
#endif #endif
#include <sys/types.h> #include <sys/types.h>
@ -351,7 +351,7 @@ incorelabel(dkname, lp)
/* Ask for a partition offser, check bounds and does the needed roudups */ /* Ask for a partition offser, check bounds and does the needed roudups */
int int
getpartoff(msg_no, defpartstart) getpartoff(msg_no, defpartstart)
int msg_no; msg msg_no;
int defpartstart; int defpartstart;
{ {
char isize[20]; char isize[20];
@ -384,7 +384,7 @@ getpartoff(msg_no, defpartstart)
/* Ask for a partition size, check bounds and does the needed roudups */ /* Ask for a partition size, check bounds and does the needed roudups */
int int
getpartsize(msg_no, partstart, defpartsize) getpartsize(msg_no, partstart, defpartsize)
int msg_no; msg msg_no;
int partstart; int partstart;
int defpartsize; int defpartsize;
{ {

8
distrib/utils/sysinst/run.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: run.c,v 1.21 1999/06/22 00:43:57 cgd Exp $ */ /* $NetBSD: run.c,v 1.22 1999/07/04 21:32:48 cgd Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -72,7 +72,7 @@ extern int errno;
/* /*
* local prototypes * local prototypes
*/ */
char* va_prog_cmdstr __P((char *cmd, va_list ap)); char* va_prog_cmdstr __P((const char *cmd, va_list ap));
int launch_subwin __P((WINDOW *actionwin, char **args, struct winsize win, int display)); int launch_subwin __P((WINDOW *actionwin, char **args, struct winsize win, int display));
int log_flip __P((void)); int log_flip __P((void));
int script_flip __P((void)); int script_flip __P((void));
@ -237,7 +237,7 @@ do_system(execstr)
* XXX return result is in a static buffer. * XXX return result is in a static buffer.
*/ */
char * char *
va_prog_cmdstr(char *cmd, va_list ap) va_prog_cmdstr(const char *cmd, va_list ap)
{ {
static char command[STRSIZE]; static char command[STRSIZE];
@ -419,7 +419,7 @@ loop:
*/ */
int int
run_prog(int fatal, int display, char *errmsg, char *cmd, ...) run_prog(int fatal, int display, const char *errmsg, const char *cmd, ...)
{ {
va_list ap; va_list ap;
struct winsize win; struct winsize win;

6
distrib/utils/sysinst/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.46 1999/06/22 18:47:07 cgd Exp $ */ /* $NetBSD: util.c,v 1.47 1999/07/04 21:32:49 cgd Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -718,8 +718,8 @@ cleanup_dist(name)
*/ */
int int
get_and_unpack_sets(success_msg, failure_msg) get_and_unpack_sets(success_msg, failure_msg)
int success_msg; msg success_msg;
int failure_msg; msg failure_msg;
{ {
/* Ensure mountpoint for distribution files exists in current root. */ /* Ensure mountpoint for distribution files exists in current root. */