mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- changed some function argument and return types from char * to const char *

Browse Source 
(grabbed from patch included in FC5 Bochs package for wxWidgets 2.6.x)
This commit is contained in:
Volker Ruppert 2006-03-13 18:55:53 +00:00
parent 7997876711
commit 2e144d5862
6 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/bochs.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: bochs.h,v 1.191 2006-03-11 22:40:32 vruppert Exp $
// $Id: bochs.h,v 1.192 2006-03-13 18:55:52 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -109,8 +109,8 @@ int bx_begin_simulation(int argc, char *argv[]);
void bx_stop_simulation();
char *bx_find_bochsrc(void);
int bx_parse_cmdline(int arg, int argc, char *argv[]);
int bx_read_configuration(char *rcfile);
int bx_write_configuration(char *rcfile, int overwrite);
int bx_read_configuration(const char *rcfile);
int bx_write_configuration(const char *rcfile, int overwrite);
void bx_reset_options(void);
Bit32u crc32(const Bit8u *buf, int len);
// for param-tree testing only

22
bochs/config.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.97 2006-03-08 18:10:38 vruppert Exp $
// $Id: config.cc,v 1.98 2006-03-13 18:55:52 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -47,9 +47,9 @@ int bochsrc_include_count = 0;
extern bx_debug_t bx_dbg;
static char *get_builtin_variable(char *varname);
static Bit32s parse_line_unformatted(char *context, char *line);
static Bit32s parse_line_formatted(char *context, int num_params, char *params[]);
static int parse_bochsrc(char *rcfile);
static Bit32s parse_line_unformatted(const char *context, char *line);
static Bit32s parse_line_formatted(const char *context, int num_params, char *params[]);
static int parse_bochsrc(const char *rcfile);
static int get_floppy_type_from_image(const char *filename);
static Bit64s bx_param_handler(bx_param_c *param, int set, Bit64s val)
@ -166,7 +166,7 @@ static Bit64s bx_param_handler(bx_param_c *param, int set, Bit64s val)
return val;
}
char *bx_param_string_handler(bx_param_string_c *param, int set, char *val, int maxlen)
const char *bx_param_string_handler(bx_param_string_c *param, int set, const char *val, int maxlen)
{
char pname[BX_PATHNAME_LEN];
Bit8u channel, device;
@ -1665,7 +1665,7 @@ void bx_reset_options()
SIM->get_param("log")->reset();
}
int bx_read_configuration (char *rcfile)
int bx_read_configuration(const char *rcfile)
{
// parse rcfile first, then parse arguments in order.
BX_INFO (("reading configuration from %s", rcfile));
@ -1737,7 +1737,7 @@ char *bx_find_bochsrc ()
return strdup (rcfile);
}
static int parse_bochsrc(char *rcfile)
static int parse_bochsrc(const char *rcfile)
{
FILE *fd = NULL;
char *ret;
@ -1808,7 +1808,7 @@ static char *get_builtin_variable(char *varname)
}
}
static Bit32s parse_line_unformatted(char *context, char *line)
static Bit32s parse_line_unformatted(const char *context, char *line)
{
#define MAX_PARAMS_LEN 40
char *ptr;
@ -1962,7 +1962,7 @@ int get_floppy_type_from_image(const char *filename)
}
}
static Bit32s parse_log_options(char *context, char *loglev, char *param1)
static Bit32s parse_log_options(const char *context, char *loglev, char *param1)
{
int level;
@ -1995,7 +1995,7 @@ static Bit32s parse_log_options(char *context, char *loglev, char *param1)
return 0;
}
static Bit32s parse_line_formatted(char *context, int num_params, char *params[])
static Bit32s parse_line_formatted(const char *context, int num_params, char *params[])
{
int i, slot, t;
Bit8u idx;
@ -3315,7 +3315,7 @@ int bx_write_keyboard_options(FILE *fp)
// 0: written ok
// -1: failed
// -2: already exists, and overwrite was off
int bx_write_configuration(char *rc, int overwrite)
int bx_write_configuration(const char *rc, int overwrite)
{
int i;
char *strptr, tmppath[80], tmpaddr[80], tmpdev[80];

16
bochs/gui/siminterface.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.cc,v 1.132 2006-03-11 22:40:32 vruppert Exp $
// $Id: siminterface.cc,v 1.133 2006-03-13 18:55:53 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// See siminterface.h for description of the siminterface concept.
@ -69,8 +69,8 @@ public:
virtual void quit_sim(int code);
virtual int get_exit_code() { return exit_code; }
virtual int get_default_rc(char *path, int len);
virtual int read_rc(char *path);
virtual int write_rc(char *path, int overwrite);
virtual int read_rc(const char *path);
virtual int write_rc(const char *path, int overwrite);
virtual int get_log_file(char *path, int len);
virtual int set_log_file(char *path);
virtual int get_log_prefix(char *prefix, int len);
@ -367,7 +367,7 @@ int bx_real_sim_c::get_default_rc(char *path, int len)
return 0;
}
int bx_real_sim_c::read_rc(char *rc)
int bx_real_sim_c::read_rc(const char *rc)
{
return bx_read_configuration(rc);
}
@ -376,7 +376,7 @@ int bx_real_sim_c::read_rc(char *rc)
// 0: written ok
// -1: failed
// -2: already exists, and overwrite was off
int bx_real_sim_c::write_rc(char *rc, int overwrite)
int bx_real_sim_c::write_rc(const char *rc, int overwrite)
{
return bx_write_configuration(rc, overwrite);
}
@ -1307,12 +1307,14 @@ Bit32s bx_param_string_c::get(char *buf, int len)
return 0;
}
void bx_param_string_c::set(char *buf)
void bx_param_string_c::set(const char *buf)
{
if (options->get() & RAW_BYTES)
memcpy(val, buf, maxsize);
else
else {
strncpy(val, buf, maxsize);
val[maxsize - 1] = 0;
}
if (handler) {
// the handler can return a different char* to be copied into the value
buf = (*handler)(this, 1, buf, -1);

10
bochs/gui/siminterface.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.h,v 1.178 2006-03-09 20:16:17 vruppert Exp $
// $Id: siminterface.h,v 1.179 2006-03-13 18:55:53 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Intro to siminterface by Bryce Denney:
@ -802,7 +802,7 @@ public:
#endif
};
typedef char* (*param_string_event_handler)(class bx_param_string_c *, int set, char *val, int maxlen);
typedef const char* (*param_string_event_handler)(class bx_param_string_c *, int set, const char *val, int maxlen);
class BOCHSAPI bx_param_string_c : public bx_param_c {
int maxsize;
@ -832,7 +832,7 @@ public:
virtual void set_enabled(int enabled);
Bit32s get(char *buf, int len);
char *getptr() {return val; }
void set(char *buf);
void set(const char *buf);
bx_bool equals(const char *buf);
bx_param_num_c *get_options() { return options; }
void set_separator(char sep) {separator = sep; }
@ -1093,8 +1093,8 @@ public:
virtual int get_exit_code() { return 0; }
virtual int get_default_rc(char *path, int len) {return -1;}
virtual int read_rc(char *path) {return -1;}
virtual int write_rc(char *rc, int overwrite) {return -1;}
virtual int read_rc(const char *path) {return -1;}
virtual int write_rc(const char *rc, int overwrite) {return -1;}
virtual int get_log_file(char *path, int len) {return -1;}
virtual int set_log_file(char *path) {return -1;}
virtual int get_log_prefix(char *prefix, int len) {return -1;}

4
bochs/iodev/pciusb.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pciusb.cc,v 1.36 2006-03-07 21:11:19 sshwarts Exp $
// $Id: pciusb.cc,v 1.37 2006-03-13 18:55:53 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004 MandrakeSoft S.A.
@ -1794,7 +1794,7 @@ bx_bool bx_pciusb_c::flash_stick(Bit8u *packet, Bit16u size, bx_bool out)
return 1;
}
char *bx_pciusb_c::usb_param_handler(bx_param_string_c *param, int set, char *val, int maxlen)
const char *bx_pciusb_c::usb_param_handler(bx_param_string_c *param, int set, const char *val, int maxlen)
{
// handler for USB runtime parameters
if (set) {

4
bochs/iodev/pciusb.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pciusb.h,v 1.16 2006-03-07 21:11:19 sshwarts Exp $
// $Id: pciusb.h,v 1.17 2006-03-13 18:55:53 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004 MandrakeSoft S.A.
@ -349,7 +349,7 @@ public:
virtual Bit32u pci_read_handler(Bit8u address, unsigned io_len);
virtual void pci_write_handler(Bit8u address, Bit32u value, unsigned io_len);
static char *usb_param_handler(bx_param_string_c *param, int set, char *val, int maxlen);
static const char *usb_param_handler(bx_param_string_c *param, int set, const char *val, int maxlen);
private:
bx_bool busy;