mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* samba/*: Added many const qualifiers to properly fix the 

warnings emitted by gcc with -Wwrite-strings.
	* smbfs.c: Likewise.
This commit is contained in:
Roland Illig 2005-09-07 07:33:39 +00:00
parent 689ee9f8ae
commit 5ddb6be28e
18 changed files with 119 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vfs/ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-07 Roland Illig <roland.illig@gmx.de>
* samba/*: Added many const qualifiers to properly fix the
warnings emitted by gcc with -Wwrite-strings.
* smbfs.c: Likewise.
2005-09-05 Roland Illig <roland.illig@gmx.de>
* direntry.c: Added const qualifiers to work around gcc

44
vfs/samba/include/proto.h
View File

@ -6,13 +6,13 @@
char *unix2dos_format(char *str,BOOL overwrite);
char *dos2unix_format(char *str, BOOL overwrite);
void interpret_character_set(char *str);
void interpret_character_set(const char *str);
/* The following definitions come from lib/charset.c */
void charset_initialise(void);
void codepage_initialise(int client_codepage);
void add_char_string(char *s);
void add_char_string(const char *s);
/* The following definitions come from lib/debug.c */
@ -36,7 +36,7 @@ struct in_addr *iface_ip(struct in_addr ip);
/* The following definitions come from lib/kanji.c */
void interpret_coding_system(char *str);
void interpret_coding_system(const char *str);
BOOL is_multibyte_codepage(void);
void initialize_multibyte_vectors( int client_codepage);
@ -91,14 +91,14 @@ time_t get_create_time(SMB_STRUCT_STAT *st,BOOL fake_dirs);
/* The following definitions come from lib/username.c */
char *get_home_dir(char *user);
BOOL map_username(char *user);
struct passwd *Get_Pwnam(char *user,BOOL allow_change);
BOOL user_in_list(char *user,char *list);
const char *get_home_dir(char *user);
BOOL map_username(const char *user);
struct passwd *Get_Pwnam(const char *user);
BOOL user_in_list(const char *user,char *list);
/* The following definitions come from lib/util.c */
char *tmpdir(void);
const char *tmpdir(void);
BOOL in_group(gid_t group, gid_t current_gid, int ngroups, gid_t *groups);
char *Atoic(char *p, int *n, char *c);
char *get_numlist(char *p, uint32 **num, int *count);
@ -139,8 +139,8 @@ void *Realloc(void *p,size_t size);
BOOL get_myname(char *my_name,struct in_addr *ip);
BOOL ip_equal(struct in_addr ip1,struct in_addr ip2);
int interpret_protocol(char *str,int def);
uint32 interpret_addr(char *str);
struct in_addr *interpret_addr2(char *str);
uint32 interpret_addr(const char *str);
struct in_addr *interpret_addr2(const char *str);
BOOL zero_ip(struct in_addr ip);
BOOL matchname(char *remotehost,struct in_addr addr);
void standard_sub_basic(char *str);
@ -150,7 +150,7 @@ struct hostent *Get_Hostbyname(const char *name);
char *uidtoname(uid_t uid);
char *gidtoname(gid_t gid);
uid_t nametouid(const char *name);
void smb_panic(char *why);
void smb_panic(const char *why);
char *readdirname(DIR *p);
BOOL is_in_path(char *name, name_compare_entry *namelist);
void set_namearray(name_compare_entry **ppname_array, char *namelist);
@ -207,7 +207,7 @@ char *client_addr(int fd);
/* The following definitions come from lib/util_str.c */
void set_first_token(char *ptr);
BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize);
BOOL next_token(char **ptr,char *buff, const char *sep, size_t bufsize);
char **toktocliplist(int *ctok, char *sep);
int StrCaseCmp(const char *s, const char *t);
int StrnCaseCmp(const char *s, const char *t, size_t n);
@ -265,7 +265,7 @@ BOOL cli_session_setup(struct cli_state *cli,
char *workgroup);
BOOL cli_ulogoff(struct cli_state *cli);
BOOL cli_send_tconX(struct cli_state *cli,
char *share, char *dev, char *pass, int passlen);
const char *share, const char *dev, const char *pass, int passlen);
BOOL cli_tdis(struct cli_state *cli);
BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst);
BOOL cli_unlink(struct cli_state *cli, char *fname);
@ -279,9 +279,9 @@ BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int
size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size);
ssize_t cli_write(struct cli_state *cli,
int fnum, uint16 write_mode,
char *buf, off_t offset, size_t size);
const char *buf, off_t offset, size_t size);
ssize_t cli_smbwrite(struct cli_state *cli,
int fnum, char *buf, off_t offset, size_t size);
int fnum, const char *buf, off_t offset, size_t size);
BOOL cli_getattrE(struct cli_state *cli, int fd,
uint16 *attr, size_t *size,
time_t *c_time, time_t *a_time, time_t *m_time);
@ -327,7 +327,7 @@ BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail);
struct in_addr *name_query(int fd,const char *name,int name_type, BOOL bcast,BOOL recurse,
struct in_addr to_ip, int *count, void (*fn)(struct packet_struct *));
FILE *startlmhosts(char *fname);
FILE *startlmhosts(const char *fname);
BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr);
void endlmhosts(FILE *fp);
BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type);
@ -588,12 +588,12 @@ int lp_minprintspace(int );
int lp_printing(int );
int lp_oplock_contention_limit(int );
char lp_magicchar(int );
BOOL lp_add_home(char *pszHomename, int iDefaultService, char *pszHomedir);
BOOL lp_add_home(const char *pszHomename, int iDefaultService, const char *pszHomedir);
int lp_add_service(char *pszService, int iDefaultService);
BOOL lp_add_printer(char *pszPrintername, int iDefaultService);
BOOL lp_file_list_changed(void);
void *lp_local_ptr(int snum, void *ptr);
BOOL lp_do_parameter(int snum, char *pszParmName, char *pszParmValue);
BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue);
BOOL lp_is_default(int snum, struct parm_struct *parm);
struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters);
BOOL lp_snum_ok(int iService);
@ -603,7 +603,7 @@ void lp_killunused(BOOL (*snumused)(int ));
BOOL lp_load(const char *pszFname,BOOL global_only, BOOL save_defaults, BOOL add_ipc);
void lp_resetnumservices(void);
int lp_numservices(void);
int lp_servicenumber(char *pszServiceName);
int lp_servicenumber(const char *pszServiceName);
char *volume_label(int snum);
int lp_default_server_announce(void);
int lp_major_announce_version(void);
@ -614,7 +614,7 @@ BOOL lp_kernel_oplocks(void);
/* The following definitions come from param/params.c */
BOOL pm_process( char *FileName,
BOOL (*sfunc)(char *),
BOOL (*pfunc)(char *, char *) );
BOOL pm_process( const char *FileName,
BOOL (*sfunc)(const char *),
BOOL (*pfunc)(const char *, const char *) );
#endif /* _PROTO_H_ */

4
vfs/samba/include/smb.h
View File

@ -69,7 +69,7 @@ typedef int BOOL;
arguemnts to DEBUG() right. We have got them wrong too often in the
past */
#ifdef HAVE_STDARG_H
int Debug1( char *, ... )
int Debug1( const char *, ... )
#ifdef __GNUC__
__attribute__ ((format (printf, 1, 2)))
#endif
@ -874,7 +874,7 @@ struct parm_struct
parm_type type;
parm_class class;
void *ptr;
BOOL (*special)(char *, char **);
BOOL (*special)(const char *, char **);
const struct enum_list *enum_list;
unsigned flags;
union {

2
vfs/samba/lib/charcnv.c
View File

@ -216,7 +216,7 @@ char *dos2unix_format(char *str, BOOL overwrite)
/*
* Interpret character set.
*/
void interpret_character_set(char *str)
void interpret_character_set(const char *str)
{
if (strequal (str, "iso8859-1")) {
init_iso8859_1();

2
vfs/samba/lib/charset.c
View File

@ -374,7 +374,7 @@ for code page %d failed. Using default client codepage 850\n",
/*******************************************************************
add characters depending on a string passed by the user
********************************************************************/
void add_char_string(char *s)
void add_char_string(const char *s)
{
char *extra_chars = (char *)strdup(s);
char *t;

8
vfs/samba/lib/debug.c
View File

@ -131,13 +131,13 @@ void setup_logging( const char *pname, BOOL interactive )
* ************************************************************************** **
*/
#ifdef HAVE_STDARG_H
int Debug1( char *format_str, ... )
int Debug1( const char *format_str, ... )
{
#else
int Debug1(va_alist)
va_dcl
{
char *format_str;
const char *format_str;
#endif
va_list ap;
int old_errno = errno;
@ -148,7 +148,7 @@ va_dcl
va_start( ap, format_str );
#else
va_start( ap );
format_str = va_arg( ap, char * );
format_str = va_arg( ap, const char * );
#endif
(void)vfprintf( dbf, format_str, ap );
va_end( ap );
@ -182,7 +182,7 @@ va_dcl
va_start( ap, format_str );
#else
va_start( ap );
format_str = va_arg( ap, char * );
format_str = va_arg( ap, const char * );
#endif
(void)vfprintf( dbf, format_str, ap );
va_end( ap );

2
vfs/samba/lib/interface.c
View File

@ -124,7 +124,7 @@ static void get_broadcast(struct in_addr *if_ipaddr,
load a list of network interfaces
****************************************************************************/
static void interpret_interfaces(char *s, struct interface **interfaces,
char *description)
const char *description)
{
char *ptr;
fstring token;

2
vfs/samba/lib/kanji.c
View File

@ -1046,7 +1046,7 @@ static void setup_string_function(int codes)
Interpret coding system.
************************************************************************/
void interpret_coding_system(char *str)
void interpret_coding_system(const char *str)
{
int codes = UNKNOWN_CODE;

32
vfs/samba/lib/username.c
View File

@ -23,17 +23,17 @@
extern int DEBUGLEVEL;
/* internal functions */
static struct passwd *uname_string_combinations(char *s, struct passwd * (*fn) (char *), int N);
static struct passwd *uname_string_combinations2(char *s, int offset, struct passwd * (*fn) (char *), int N);
static struct passwd *uname_string_combinations(char *s, struct passwd * (*fn) (const char *), int N);
static struct passwd *uname_string_combinations2(char *s, int offset, struct passwd * (*fn) (const char *), int N);
/****************************************************************************
get a users home directory.
****************************************************************************/
char *get_home_dir(char *user)
const char *get_home_dir(char *user)
{
struct passwd *pass;
pass = Get_Pwnam(user, False);
pass = Get_Pwnam(user);
if (!pass) return(NULL);
return(pass->pw_dir);
@ -51,7 +51,7 @@ function. Previously, the map_username was being called
every time Get_Pwnam was called.
Returns True if username was changed, false otherwise.
********************************************************************/
BOOL map_username(char *user)
BOOL map_username(const char *user)
{
static BOOL initialised=False;
static fstring last_from,last_to;
@ -148,7 +148,7 @@ BOOL map_username(char *user)
/****************************************************************************
Get_Pwnam wrapper
****************************************************************************/
static struct passwd *_Get_Pwnam(char *s)
static struct passwd *_Get_Pwnam(const char *s)
{
struct passwd *ret;
@ -174,24 +174,19 @@ static struct passwd *_Get_Pwnam(char *s)
/****************************************************************************
a wrapper for getpwnam() that tries with all lower and all upper case
if the initial name fails. Also tried with first letter capitalised
Note that this can change user!
****************************************************************************/
struct passwd *Get_Pwnam(char *user,BOOL allow_change)
struct passwd *Get_Pwnam(const char *a_user)
{
fstring user2;
fstring user;
int last_char;
int usernamelevel = lp_usernamelevel();
struct passwd *ret;
if (!user || !(*user))
if (!a_user || !(*a_user))
return(NULL);
StrnCpy(user2,user,sizeof(user2)-1);
if (!allow_change) {
user = &user2[0];
}
StrnCpy(user,a_user,sizeof(user)-1);
ret = _Get_Pwnam(user);
if (ret) return(ret);
@ -222,9 +217,6 @@ struct passwd *Get_Pwnam(char *user,BOOL allow_change)
ret = uname_string_combinations(user, _Get_Pwnam, usernamelevel);
if (ret) return(ret);
if (allow_change)
fstrcpy(user,user2);
return(NULL);
}
@ -379,7 +371,7 @@ try all combinations with N uppercase letters.
offset is the first char to try and change (start with 0)
it assumes the string starts lowercased
****************************************************************************/
static struct passwd *uname_string_combinations2(char *s,int offset,struct passwd *(*fn)(char *),int N)
static struct passwd *uname_string_combinations2(char *s,int offset,struct passwd *(*fn)(const char *),int N)
{
int len = strlen(s);
int i;
@ -413,7 +405,7 @@ try all combinations with up to N uppercase letters.
offset is the first char to try and change (start with 0)
it assumes the string starts lowercased
****************************************************************************/
static struct passwd * uname_string_combinations(char *s,struct passwd * (*fn)(char *),int N)
static struct passwd * uname_string_combinations(char *s,struct passwd * (*fn)(const char *),int N)
{
int n;
struct passwd *ret;

21
vfs/samba/lib/util.c
View File

@ -101,7 +101,7 @@ pstring myhostname="";
pstring user_socket_options="";
pstring sesssetup_user="";
static char * const samlogon_user = "";
static const char * const samlogon_user = "";
const BOOL sam_logon_in_ssb = False;
@ -115,7 +115,7 @@ char **my_netbios_names;
find a suitable temporary directory. The result should be copied immediately
as it may be overwritten by a subsequent call
****************************************************************************/
char *tmpdir(void)
const char *tmpdir(void)
{
char *p;
if ((p = getenv("MC_TMPDIR")) || (p = getenv("TMPDIR"))) {
@ -1748,7 +1748,7 @@ int interpret_protocol(char *str,int def)
/****************************************************************************
interpret an internet address or name into an IP address in 4 byte form
****************************************************************************/
uint32 interpret_addr(char *str)
uint32 interpret_addr(const char *str)
{
struct hostent *hp;
uint32 res;
@ -1787,7 +1787,7 @@ uint32 interpret_addr(char *str)
/*******************************************************************
a convenient addition to interpret_addr()
******************************************************************/
struct in_addr *interpret_addr2(char *str)
struct in_addr *interpret_addr2(const char *str)
{
static struct in_addr ret;
uint32 a = interpret_addr(str);
@ -1991,7 +1991,7 @@ static char *automount_lookup(char *user_name)
This is Luke's original function with the NIS lookup code
moved out to a separate function.
*******************************************************************/
static char *automount_server(char *user_name)
static char *automount_server(const char *user_name)
{
static pstring server_name;
@ -2066,7 +2066,7 @@ void standard_sub_basic(char *str)
char *s, *p;
char pidstr[10];
struct passwd *pass;
char *username = sam_logon_in_ssb ? samlogon_user : sesssetup_user;
const char *username = sam_logon_in_ssb ? samlogon_user : sesssetup_user;
for (s = str ; s && *s && (p = strchr(s,'%')); s = p )
{
@ -2074,7 +2074,7 @@ void standard_sub_basic(char *str)
{
case 'G' :
{
if ((pass = Get_Pwnam(username,False))!=NULL)
if ((pass = Get_Pwnam(username))!=NULL)
{
string_sub(p,"%G",gidtoname(pass->pw_gid));
}
@ -2154,7 +2154,8 @@ do some standard substitutions in a string
****************************************************************************/
void standard_sub(connection_struct *conn,char *str)
{
char *p, *s, *home;
char *p, *s;
const char *home;
for (s=str; (p=strchr(s, '%'));s=p) {
switch (*(p+1)) {
@ -2324,9 +2325,9 @@ uid_t nametouid(const char *name)
/*******************************************************************
something really nasty happened - panic!
********************************************************************/
void smb_panic(char *why)
void smb_panic(const char *why)
{
char *cmd = lp_panic_action();
const char *cmd = lp_panic_action();
if (cmd && *cmd) {
system(cmd);
}

2
vfs/samba/lib/util_sock.c
View File

@ -61,7 +61,7 @@ enum SOCK_OPT_TYPES {OPT_BOOL,OPT_INT,OPT_ON};
static const struct
{
char *name;
const char *name;
int level;
int option;
int value;

2
vfs/samba/lib/util_str.c
View File

@ -36,7 +36,7 @@ void set_first_token(char *ptr)
Based on a routine by GJC@VILLAGE.COM.
Extensively modified by Andrew.Tridgell@anu.edu.au
****************************************************************************/
BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize)
BOOL next_token(char **ptr,char *buff, const char *sep, size_t bufsize)
{
char *s;
BOOL quoted;

18
vfs/samba/libsmb/clientgen.c
View File

@ -87,7 +87,7 @@ static BOOL cli_send_smb(struct cli_state *cli)
struct
{
int err;
char *message;
const char *message;
} const rap_errmap[] =
{
{5, "User has insufficient privilege" },
@ -218,7 +218,7 @@ static char *fix_char_ptr(unsigned int datap, unsigned int converter,
send a SMB trans or trans2 request
****************************************************************************/
static BOOL cli_send_trans(struct cli_state *cli, int trans,
char *name, int pipe_name_len,
const char *name, int pipe_name_len,
int fid, int flags,
uint16 *setup, int lsetup, int msetup,
char *param, int lparam, int mparam,
@ -581,7 +581,7 @@ int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, co
char *sname = p;
int type = SVAL(p,14);
int comment_offset = IVAL(p,16) & 0xFFFF;
char *cmnt = comment_offset?(rdata+comment_offset-converter):"";
const char *cmnt = comment_offset?(rdata+comment_offset-converter):"";
fn(sname, type, cmnt, state);
}
} else {
@ -654,7 +654,7 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
for (i = 0;i < count;i++, p += 26) {
char *sname = p;
int comment_offset = (IVAL(p,22) & 0xFFFF)-converter;
char *cmnt = comment_offset?(rdata+comment_offset):"";
const char *cmnt = comment_offset?(rdata+comment_offset):"";
if (comment_offset < 0 || comment_offset > rdrcnt) continue;
stype = IVAL(p,18) & ~SV_TYPE_LOCAL_LIST_ONLY;
@ -677,7 +677,7 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
static struct {
int prot;
char *name;
const char *name;
}
const prots[] =
{
@ -847,7 +847,7 @@ BOOL cli_ulogoff(struct cli_state *cli)
send a tconX
****************************************************************************/
BOOL cli_send_tconX(struct cli_state *cli,
char *share, char *dev, char *pass, int passlen)
const char *share, const char *dev, const char *pass, int passlen)
{
fstring fullshare, pword;
char *p;
@ -1408,7 +1408,7 @@ size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t
/****************************************************************************
issue a single SMBwrite and don't wait for a reply
****************************************************************************/
static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint16 mode, char *buf,
static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint16 mode, const char *buf,
size_t size, int i)
{
char *p;
@ -1452,7 +1452,7 @@ static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint1
****************************************************************************/
ssize_t cli_write(struct cli_state *cli,
int fnum, uint16 write_mode,
char *buf, off_t offset, size_t size)
const char *buf, off_t offset, size_t size)
{
int bwritten = 0;
int issued = 0;
@ -1503,7 +1503,7 @@ ssize_t cli_write(struct cli_state *cli,
write to a file using a SMBwrite and not bypassing 0 byte writes
****************************************************************************/
ssize_t cli_smbwrite(struct cli_state *cli,
int fnum, char *buf, off_t offset, size_t size)
int fnum, const char *buf, off_t offset, size_t size)
{
char *p;

8
vfs/samba/libsmb/namequery.c
View File

@ -223,7 +223,7 @@ struct in_addr *name_query(int fd,const char *name,int name_type, BOOL bcast,BOO
Start parsing the lmhosts file.
*********************************************************/
FILE *startlmhosts(char *fname)
FILE *startlmhosts(const char *fname)
{
FILE *fp = sys_fopen(fname,"r");
if (!fp) {
@ -347,7 +347,8 @@ static BOOL resolve_bcast(const char *name, struct in_addr *return_ip, int name_
struct in_addr *iplist = NULL;
int count;
int num_interfaces = iface_count();
set_socket_options(sock,"SO_BROADCAST");
static char so_broadcast[] = "SO_BROADCAST";
set_socket_options(sock, so_broadcast);
/*
* Lookup the name on all the interfaces, return on
* the first successful match.
@ -508,8 +509,9 @@ BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type)
}
pstrcpy(name_resolve_list, lp_name_resolve_order());
if (!name_resolve_list || !*name_resolve_list)
pstrcpy(name_resolve_list, "host");
ptr = name_resolve_list;
if (!ptr || !*ptr) ptr = "host";
while (next_token(&ptr, tok, LIST_SEP, sizeof(tok))) {
if((strequal(tok, "host") || strequal(tok, "hosts"))) {

6
vfs/samba/libsmb/nmblib.c
View File

@ -28,7 +28,7 @@ int num_good_sends = 0;
int num_good_receives = 0;
static struct opcode_names {
char *nmb_opcode_name;
const char *nmb_opcode_name;
int opcode;
} const nmb_header_opcode_names[] = {
{"Query", 0 },
@ -44,7 +44,7 @@ static struct opcode_names {
/****************************************************************************
* Lookup a nmb opcode name.
****************************************************************************/
static char *lookup_opcode_name( int opcode )
static const char *lookup_opcode_name( int opcode )
{
const struct opcode_names *op_namep = nmb_header_opcode_names;
@ -59,7 +59,7 @@ static char *lookup_opcode_name( int opcode )
/****************************************************************************
print out a res_rec structure
****************************************************************************/
static void debug_nmb_res_rec(struct res_rec *res, char *hdr)
static void debug_nmb_res_rec(struct res_rec *res, const char *hdr)
{
int i, j;

50
vfs/samba/param/loadparm.c
View File

@ -450,11 +450,11 @@ static int default_server_announce;
#define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
/* prototypes for the special type handlers */
static BOOL handle_valid_chars(char *pszParmValue, char **ptr);
static BOOL handle_include(char *pszParmValue, char **ptr);
static BOOL handle_copy(char *pszParmValue, char **ptr);
static BOOL handle_character_set(char *pszParmValue,char **ptr);
static BOOL handle_coding_system(char *pszParmValue,char **ptr);
static BOOL handle_valid_chars(const char *pszParmValue, char **ptr);
static BOOL handle_include(const char *pszParmValue, char **ptr);
static BOOL handle_copy(const char *pszParmValue, char **ptr);
static BOOL handle_character_set(const char *pszParmValue,char **ptr);
static BOOL handle_coding_system(const char *pszParmValue,char **ptr);
#if 0
static void set_default_server_announce_type(void);
#endif /* 0 */
@ -1291,15 +1291,15 @@ FN_LOCAL_CHAR(lp_magicchar,magic_char)
/* local prototypes */
static int strwicmp( const char *psz1, const char *psz2 );
static int map_parameter( char *pszParmName);
static BOOL set_boolean( BOOL *pb, char *pszParmValue );
static int getservicebyname(char *pszServiceName, service *pserviceDest);
static int map_parameter( const char *pszParmName);
static BOOL set_boolean( BOOL *pb, const char *pszParmValue );
static int getservicebyname(const char *pszServiceName, service *pserviceDest);
static void copy_service( service *pserviceDest,
service *pserviceSource,
BOOL *pcopymapDest );
static BOOL service_ok(int iService);
static BOOL do_parameter(char *pszParmName, char *pszParmValue);
static BOOL do_section(char *pszSectionName);
static BOOL do_parameter(const char *pszParmName, const char *pszParmValue);
static BOOL do_section(const char *pszSectionName);
static void init_copymap(service *pservice);
@ -1343,7 +1343,7 @@ static void free_service(service *pservice)
add a new service to the services array initialising it with the given
service
***************************************************************************/
static int add_a_service(service *pservice, char *name)
static int add_a_service(service *pservice, const char *name)
{
int i;
service tservice;
@ -1393,7 +1393,7 @@ static int add_a_service(service *pservice, char *name)
add a new home service, with the specified home directory, defaults coming
from service ifrom
***************************************************************************/
BOOL lp_add_home(char *pszHomename, int iDefaultService, char *pszHomedir)
BOOL lp_add_home(const char *pszHomename, int iDefaultService, const char *pszHomedir)
{
int i = add_a_service(pSERVICE(iDefaultService),pszHomename);
@ -1494,7 +1494,7 @@ static int strwicmp(const char *psz1, const char *psz2)
Map a parameter's string representation to something we can use.
Returns False if the parameter string is not recognised, else TRUE.
***************************************************************************/
static int map_parameter(char *pszParmName)
static int map_parameter(const char *pszParmName)
{
int iIndex;
@ -1515,7 +1515,7 @@ Set a boolean variable from the text value stored in the passed string.
Returns True in success, False if the passed string does not correctly
represent a boolean.
***************************************************************************/
static BOOL set_boolean(BOOL *pb, char *pszParmValue)
static BOOL set_boolean(BOOL *pb, const char *pszParmValue)
{
BOOL bRetval;
@ -1541,7 +1541,7 @@ static BOOL set_boolean(BOOL *pb, char *pszParmValue)
/***************************************************************************
Find a service by name. Otherwise works like get_service.
***************************************************************************/
static int getservicebyname(char *pszServiceName, service *pserviceDest)
static int getservicebyname(const char *pszServiceName, service *pserviceDest)
{
int iService;
@ -1740,7 +1740,7 @@ BOOL lp_file_list_changed(void)
/***************************************************************************
handle the interpretation of the coding system parameter
*************************************************************************/
static BOOL handle_coding_system(char *pszParmValue,char **ptr)
static BOOL handle_coding_system(const char *pszParmValue,char **ptr)
{
string_set(ptr,pszParmValue);
interpret_coding_system(pszParmValue);
@ -1750,7 +1750,7 @@ static BOOL handle_coding_system(char *pszParmValue,char **ptr)
/***************************************************************************
handle the interpretation of the character set system parameter
***************************************************************************/
static BOOL handle_character_set(char *pszParmValue,char **ptr)
static BOOL handle_character_set(const char *pszParmValue,char **ptr)
{
string_set(ptr,pszParmValue);
interpret_character_set(pszParmValue);
@ -1761,7 +1761,7 @@ static BOOL handle_character_set(char *pszParmValue,char **ptr)
/***************************************************************************
handle the valid chars lines
***************************************************************************/
static BOOL handle_valid_chars(char *pszParmValue,char **ptr)
static BOOL handle_valid_chars(const char *pszParmValue,char **ptr)
{
string_set(ptr,pszParmValue);
@ -1779,7 +1779,7 @@ static BOOL handle_valid_chars(char *pszParmValue,char **ptr)
/***************************************************************************
handle the include operation
***************************************************************************/
static BOOL handle_include(char *pszParmValue,char **ptr)
static BOOL handle_include(const char *pszParmValue,char **ptr)
{
pstring fname;
pstrcpy(fname,pszParmValue);
@ -1802,7 +1802,7 @@ static BOOL handle_include(char *pszParmValue,char **ptr)
/***************************************************************************
handle the interpretation of the copy parameter
***************************************************************************/
static BOOL handle_copy(char *pszParmValue,char **ptr)
static BOOL handle_copy(const char *pszParmValue,char **ptr)
{
BOOL bRetval;
int iTemp;
@ -1872,7 +1872,7 @@ void *lp_local_ptr(int snum, void *ptr)
Process a parameter for a particular service number. If snum < 0
then assume we are in the globals
***************************************************************************/
BOOL lp_do_parameter(int snum, char *pszParmName, char *pszParmValue)
BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue)
{
int parmnum, i;
void *parm_ptr=NULL; /* where we are going to store the result */
@ -1981,7 +1981,7 @@ BOOL lp_do_parameter(int snum, char *pszParmName, char *pszParmValue)
/***************************************************************************
Process a parameter.
***************************************************************************/
static BOOL do_parameter( char *pszParmName, char *pszParmValue )
static BOOL do_parameter( const char *pszParmName, const char *pszParmValue )
{
if( !bInGlobalSection && bGlobalOnly )
return(True);
@ -2041,7 +2041,7 @@ Process a new section (service). At this stage all sections are services.
Later we'll have special sections that permit server parameters to be set.
Returns True on success, False on failure.
***************************************************************************/
static BOOL do_section(char *pszSectionName)
static BOOL do_section(const char *pszSectionName)
{
BOOL bRetval;
BOOL isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) ||
@ -2177,7 +2177,7 @@ static void lp_add_auto_services(char *str)
homes = lp_servicenumber(HOMES_NAME);
for (p=strtok(s,LIST_SEP);p;p=strtok(NULL,LIST_SEP)) {
char *home = get_home_dir(p);
const char *home = get_home_dir(p);
if (lp_servicenumber(p) >= 0) continue;
@ -2340,7 +2340,7 @@ exist. Note that this is a DIFFERENT ANIMAL from the internal function
getservicebyname()! This works ONLY if all services have been loaded, and
does not copy the found service.
***************************************************************************/
int lp_servicenumber(char *pszServiceName)
int lp_servicenumber(const char *pszServiceName)
{
int iService;

24
vfs/samba/param/params.c
View File

@ -181,7 +181,7 @@ static int Continuation( char *line, int pos )
} /* Continuation */
static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
static BOOL Section( FILE *InFile, BOOL (*sfunc)(const char *) )
/* ------------------------------------------------------------------------ **
* Scan a section name, and pass the name to function sfunc().
*
@ -199,7 +199,7 @@ static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
int c;
int i;
int end;
char *func = "params.c:Section() -";
const char *func = "params.c:Section() -";
i = 0; /* <i> is the offset of the next free byte in bufr[] and */
end = 0; /* <end> is the current "end of string" offset. In most */
@ -274,7 +274,7 @@ static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
return( False );
} /* Section */
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(const char *, const char *), int c )
/* ------------------------------------------------------------------------ **
* Scan a parameter name and value, and pass these two fields to pfunc().
*
@ -302,7 +302,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
int i = 0; /* Position within bufr. */
int end = 0; /* bufr[end] is current end-of-string. */
int vstart = 0; /* Starting position of the parameter value. */
char *func = "params.c:Parameter() -";
const char *func = "params.c:Parameter() -";
/* Read the parameter name. */
while( 0 == vstart ) /* Loop until we've found the start of the value. */
@ -416,8 +416,8 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
} /* Parameter */
static BOOL Parse( FILE *InFile,
BOOL (*sfunc)(char *),
BOOL (*pfunc)(char *, char *) )
BOOL (*sfunc)(const char *),
BOOL (*pfunc)(const char *, const char *) )
/* ------------------------------------------------------------------------ **
* Scan & parse the input.
*
@ -476,7 +476,7 @@ static BOOL Parse( FILE *InFile,
return( True );
} /* Parse */
static FILE *OpenConfFile( char *FileName )
static FILE *OpenConfFile( const char *FileName )
/* ------------------------------------------------------------------------ **
* Open a configuration file.
*
@ -489,7 +489,7 @@ static FILE *OpenConfFile( char *FileName )
*/
{
FILE *OpenedFile;
char *func = "params.c:OpenConfFile() -";
const char *func = "params.c:OpenConfFile() -";
extern BOOL in_client;
int lvl = in_client?1:0;
@ -510,9 +510,9 @@ static FILE *OpenConfFile( char *FileName )
return( OpenedFile );
} /* OpenConfFile */
BOOL pm_process( char *FileName,
BOOL (*sfunc)(char *),
BOOL (*pfunc)(char *, char *) )
BOOL pm_process( const char *FileName,
BOOL (*sfunc)(const char *),
BOOL (*pfunc)(const char *, const char *) )
/* ------------------------------------------------------------------------ **
* Process the named parameter file.
*
@ -529,7 +529,7 @@ BOOL pm_process( char *FileName,
{
int result;
FILE *InFile;
char *func = "params.c:pm_process() -";
const char *func = "params.c:pm_process() -";
InFile = OpenConfFile( FileName ); /* Open the config file. */
if( NULL == InFile )

3
vfs/smbfs.c
View File

@ -1010,6 +1010,7 @@ smbfs_do_connect (const char *server, char *share)
static int
smbfs_get_master_browser(char **host)
{
static char so_broadcast[] = "SO_BROADCAST";
int count;
struct in_addr *ip_list, bcast_addr;
extern struct in_addr ipzero;
@ -1019,7 +1020,7 @@ smbfs_get_master_browser(char **host)
interpret_addr(lp_socket_address()), True );
if (fd == -1)
return 0;
set_socket_options(fd, "SO_BROADCAST");
set_socket_options(fd, so_broadcast);
ip_list = iface_bcast(ipzero);
bcast_addr = *ip_list;
if ((ip_list = name_query(fd, "\01\02__MSBROWSE__\02", 1, True,