declare constant function parameters const (as well as constant function return values)
This commit is contained in:
+1
-1
@@ -43,7 +43,7 @@ int
|
||||
drivers_load_driver( char * name )
|
||||
{
|
||||
Driver * driver;
|
||||
char * s;
|
||||
const char * s;
|
||||
char * driverpath;
|
||||
char * filename;
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ static void CwLnx_draw_frame(Driver *drvthis, char *dat);
|
||||
static char CwLnx_parse_keypad_setting(Driver *drvthis, char * keyname, char default_value)
|
||||
{
|
||||
char return_val = 0;
|
||||
char * s;
|
||||
const char *s;
|
||||
char buf[255];
|
||||
|
||||
s = drvthis->config_get_string(drvthis->name, keyname, 0, NULL);
|
||||
@@ -501,7 +501,7 @@ int CwLnx_init(Driver * drvthis)
|
||||
int tmp;
|
||||
int w;
|
||||
int h;
|
||||
char *s;
|
||||
const char *s;
|
||||
|
||||
PrivateData *p;
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ static void EyeboxOne_use_led(int fd, int led, int color);
|
||||
static char EyeboxOne_parse_keypad_setting (Driver *drvthis, char * keyname, char default_value)
|
||||
{
|
||||
char return_val = 0;
|
||||
char * s;
|
||||
const char *s;
|
||||
char buf[255];
|
||||
|
||||
s = drvthis->config_get_string(drvthis->name, keyname, 0, NULL);
|
||||
|
||||
@@ -229,7 +229,7 @@ static void MtxOrb_old_hbar (Driver *drvthis, int x, int y, int len);
|
||||
static char MtxOrb_parse_keypad_setting (Driver *drvthis, char * keyname, char default_value)
|
||||
{
|
||||
char return_val = 0;
|
||||
char * s;
|
||||
const char *s;
|
||||
char buf[255];
|
||||
|
||||
s = drvthis->config_get_string(drvthis->name, keyname, 0, NULL);
|
||||
|
||||
@@ -258,8 +258,7 @@ void
|
||||
serial_HD44780_backlight (PrivateData *p, unsigned char state)
|
||||
{
|
||||
/* TODO */
|
||||
if(p->have_backlight);
|
||||
return 0;
|
||||
//if (p->have_backlight) ....
|
||||
}
|
||||
|
||||
unsigned char
|
||||
|
||||
@@ -111,7 +111,7 @@ static char *defaultKeyMapMatrix[KEYPAD_MAXY][KEYPAD_MAXX] = {
|
||||
void HD44780_position (Driver *drvthis, int x, int y);
|
||||
static void uPause (PrivateData *p, int usecs);
|
||||
unsigned char HD44780_scankeypad(PrivateData *p);
|
||||
static int parse_span_list (int *spanListArray[], int *spLsize, int *dispOffsets[], int *dOffsize, int *dispSizeArray[], char *spanlist);
|
||||
static int parse_span_list (int *spanListArray[], int *spLsize, int *dispOffsets[], int *dOffsize, int *dispSizeArray[], const char *spanlist);
|
||||
|
||||
// Vars for the server core
|
||||
MODULE_EXPORT char * api_version = API_VERSION;
|
||||
@@ -132,7 +132,7 @@ HD44780_init (Driver * drvthis)
|
||||
// TODO: remove the two magic numbers below
|
||||
// TODO: single point of return
|
||||
char buf[40];
|
||||
char *s;
|
||||
const char *s;
|
||||
int i;
|
||||
int if_type = IF_TYPE_PARPORT;
|
||||
PrivateData *p;
|
||||
@@ -1072,7 +1072,7 @@ HD44780_output (Driver *drvthis, int on)
|
||||
// returns number of span elements, -1 on parse error
|
||||
|
||||
int
|
||||
parse_span_list (int *spanListArray[], int *spLsize, int *dispOffsets[], int *dOffsize, int *dispSizeArray[], char *spanlist)
|
||||
parse_span_list (int *spanListArray[], int *spLsize, int *dispOffsets[], int *dOffsize, int *dispSizeArray[], const char *spanlist)
|
||||
{
|
||||
int j = 0, retVal = 0;
|
||||
|
||||
|
||||
@@ -133,7 +133,7 @@ joy_init (Driver *drvthis)
|
||||
|
||||
for (i = 0; i < p->axes; i++) {
|
||||
char mapkey[50];
|
||||
char *mapval;
|
||||
const char *mapval;
|
||||
|
||||
snprintf(mapkey, sizeof(mapkey), "Map_Axis%dneg", i+1);
|
||||
mapval = drvthis->config_get_string(drvthis->name, mapkey, 0, NULL);
|
||||
@@ -154,7 +154,7 @@ joy_init (Driver *drvthis)
|
||||
|
||||
for (i = 0; i < p->buttons; i++) {
|
||||
char mapkey[50];
|
||||
char *mapval;
|
||||
const char *mapval;
|
||||
|
||||
snprintf(mapkey, sizeof(mapkey), "Map_Button%d", i+1);
|
||||
mapval = drvthis->config_get_string(drvthis->name, mapkey, 0, NULL);
|
||||
|
||||
+10
-10
@@ -169,13 +169,13 @@ typedef struct lcd_logical_driver {
|
||||
|
||||
/******** Variables in server core available for drivers ********/
|
||||
|
||||
char * name; /* Name of this driver */
|
||||
char * filename; /* Filename of the shared module */
|
||||
char *name; /* Name of this driver */
|
||||
char *filename; /* Filename of the shared module */
|
||||
|
||||
MODULE_HANDLE module_handle; /* The handle of the loaded shared module
|
||||
Is platform specific */
|
||||
|
||||
void * private_data; /* Filled by server by calling store_private_ptr()
|
||||
void *private_data; /* Filled by server by calling store_private_ptr()
|
||||
Driver should cast this to it's own
|
||||
private structure pointer */
|
||||
|
||||
@@ -188,16 +188,16 @@ typedef struct lcd_logical_driver {
|
||||
/* Configfile functions */
|
||||
/* See configfile.h for descriptions and usage. */
|
||||
|
||||
short (*config_get_bool)( char *sectionname, char *keyname, int skip, short default_value );
|
||||
long int (*config_get_int) ( char *sectionname, char *keyname, int skip, long int default_value );
|
||||
double (*config_get_float) ( char *sectionname, char *keyname, int skip, double default_value );
|
||||
char *( *config_get_string) ( char *sectionname, char *keyname, int skip, char *default_value );
|
||||
int (*config_has_section) ( char *sectionname );
|
||||
int (*config_has_key) ( char *sectionname, char *keyname );
|
||||
short (*config_get_bool) (const char *sectionname, const char *keyname, int skip, short default_value);
|
||||
long int (*config_get_int) (const char *sectionname, const char *keyname, int skip, long int default_value);
|
||||
double (*config_get_float) (const char *sectionname, const char *keyname, int skip, double default_value);
|
||||
const char *( *config_get_string)(const char *sectionname, const char *keyname, int skip, const char *default_value);
|
||||
int (*config_has_section) (const char *sectionname);
|
||||
int (*config_has_key) (const char *sectionname, const char *keyname);
|
||||
|
||||
/* Reporting function */
|
||||
/* Easily usable by including drivers/report.h */
|
||||
void (*report) ( const int level, const char *format, .../*args*/ );
|
||||
void (*report) (const int level, const char *format, .../*args*/ );
|
||||
|
||||
/* Display properties functions (for drivers that adapt to other loaded drivers) */
|
||||
int (*request_display_width) ();
|
||||
|
||||
@@ -104,7 +104,7 @@ lcterm_init (Driver *drvthis)
|
||||
/* Get and parse size */
|
||||
{
|
||||
int w, h;
|
||||
char *s = drvthis->config_get_string(drvthis->name, "Size", 0, "16x2");
|
||||
const char *s = drvthis->config_get_string(drvthis->name, "Size", 0, "16x2");
|
||||
|
||||
debug(RPT_DEBUG, "%s: reading size: %s", __FUNCTION__, s);
|
||||
|
||||
|
||||
@@ -314,7 +314,7 @@ unsigned char sed1330_readkeypad (PrivateData *p, unsigned int YData);
|
||||
MODULE_EXPORT int
|
||||
sed1330_init( Driver * drvthis )
|
||||
{
|
||||
char * s;
|
||||
const char *s;
|
||||
PrivateData * p;
|
||||
unsigned char data[8];
|
||||
|
||||
|
||||
@@ -610,7 +610,7 @@ ula200_init(Driver *drvthis)
|
||||
{
|
||||
PrivateData *p;
|
||||
int err, i;
|
||||
char *s;
|
||||
const char *s;
|
||||
|
||||
// Alocate and store private data
|
||||
p = (PrivateData *) malloc( sizeof( PrivateData) );
|
||||
|
||||
+1
-1
@@ -404,7 +404,7 @@ process_command_line(int argc, char **argv)
|
||||
static int
|
||||
process_configfile(char *configfile)
|
||||
{
|
||||
char * s;
|
||||
const char *s;
|
||||
/*char buf[64];*/
|
||||
|
||||
debug( RPT_DEBUG, "%s()", __FUNCTION__ );
|
||||
|
||||
@@ -72,7 +72,7 @@ MenuEventFunc (brightness_handler);
|
||||
|
||||
int menuscreens_init()
|
||||
{
|
||||
char *tmp;
|
||||
const char *tmp;
|
||||
|
||||
debug (RPT_DEBUG, "%s()", __FUNCTION__);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user