forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

Support "constipation" -- compile cleanly with -Wwrite-strings

Browse source
This commit is contained in:
hpa 2001-08-10 18:25:08 +00:00
parent 9b5b8c5640
commit 5b0cb11445
5 changed files with 62 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tftpd/remap.c
View file

@ -42,7 +42,7 @@ struct rule {
int nrule;
int rule_flags;
regex_t rx;
char *pattern;
const char *pattern;
};
/* Do \-substitution. Call with string == NULL to get length only. */
@ -251,7 +251,7 @@ void freerules(struct rule *r)
/* "" patterns aren't allocated by malloc() */
if ( r->pattern && *r->pattern )
free(r->pattern);
free((void *)r->pattern);
free(r);

8
tftpd/tftpd.c
View file

@ -146,7 +146,7 @@ int set_tsize(char *, char **);
int set_timeout(char *, char **);
struct options {
char *o_opt;
const char *o_opt;
int (*o_fnc)(char *, char **);
} options[] = {
{ "blksize", set_blksize },
@ -210,7 +210,7 @@ main(int argc, char **argv)
int c;
int setrv;
int timeout = 900; /* Default timeout */
char *user = "nobody"; /* Default user */
const char *user = "nobody"; /* Default user */
#ifdef WITH_REGEX
char *rewrite_file = NULL;
#endif
@ -546,7 +546,7 @@ void sendfile(struct formats *, struct tftphdr *, int);
void recvfile(struct formats *, struct tftphdr *, int);
struct formats {
char *f_mode;
const char *f_mode;
char *(*f_rewrite)(char *, int);
int (*f_validate)(char *, int, struct formats *);
void (*f_send)(struct formats *, struct tftphdr *, int);
@ -1096,7 +1096,7 @@ recvfile(struct formats *pf, struct tftphdr *oap, int oacklen)
struct errmsg {
int e_code;
char *e_msg;
const char *e_msg;
} errmsgs[] = {
{ EUNDEF, "Undefined error code" },
{ ENOTFOUND, "File not found" },