diff options
author | Jan D <jan.h.d@swipnet.se> | 2010-08-11 11:16:35 +0200 |
---|---|---|
committer | Jan D <jan.h.d@swipnet.se> | 2010-08-11 11:16:35 +0200 |
commit | 29e3613d049c9339379424fd039bf09fd55d7981 (patch) | |
tree | b14d0f03dc68d98f70f11db86eacf531f5dd3e62 | |
parent | abc9ad92b259807973af00d9f4d3132c028a35d1 (diff) | |
download | emacs-29e3613d049c9339379424fd039bf09fd55d7981.tar.gz |
Fix -Wwrite-strings warnings in fakemail.c.
* fakemail.c: Include stdlib.h for getenv. Remove declaration of
popen, fclose and pclose.
(my_name, fatal, error, put_line): Use const char*
(main): Remove extern getenv, mail_program_name is const char*.
-rw-r--r-- | lib-src/ChangeLog | 5 | ||||
-rw-r--r-- | lib-src/fakemail.c | 24 |
2 files changed, 14 insertions, 15 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 760ad116108..a7f053bcf60 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,10 @@ 2010-08-11 Jan Djärv <jan.h.d@swipnet.se> + * fakemail.c: Include stdlib.h for getenv. Remove declaration of + popen, fclose and pclose. + (my_name, fatal, error, put_line): Use const char* + (main): Remove extern getenv, mail_program_name is const char*. + * update-game-score.c (get_prefix, write_scores, main): Use const char*. * sorted-doc.c (error, fatal, states): Use const char *. diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c index 787dc83a698..16baeb266a8 100644 --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c @@ -59,6 +59,7 @@ main () #include <ctype.h> #include <time.h> #include <pwd.h> +#include <stdlib.h> /* This is to declare cuserid. */ #ifdef HAVE_UNISTD_H @@ -140,21 +141,16 @@ struct linebuffer lb; #define MAIL_PROGRAM_NAME "/bin/mail" #endif -static char *my_name; +static const char *my_name; static char *the_date; static char *the_user; static line_list file_preface; static stream_list the_streams; static boolean no_problems = true; -static void fatal (char *s1) NO_RETURN; - -extern FILE *popen (const char *, const char *); -extern int fclose (FILE *), pclose (FILE *); +static void fatal (const char *s1) NO_RETURN; #ifdef CURRENT_USER -extern struct passwd *getpwuid (); -extern unsigned short geteuid (); static struct passwd *my_entry; #define cuserid(s) \ (my_entry = getpwuid (((int) geteuid ())), \ @@ -166,7 +162,7 @@ static struct passwd *my_entry; /* Print error message. `s1' is printf control string, `s2' is arg for it. */ static void -error (char *s1, char *s2) +error (const char *s1, const char *s2) { printf ("%s: ", my_name); printf (s1, s2); @@ -177,7 +173,7 @@ error (char *s1, char *s2) /* Print error message and exit. */ static void -fatal (char *s1) +fatal (const char *s1) { error ("%s", s1); exit (EXIT_FAILURE); @@ -464,20 +460,20 @@ put_string (char *s) } void -put_line (char *string) +put_line (const char *string) { register stream_list rem; for (rem = the_streams; rem != ((stream_list) NULL); rem = rem->rest_streams) { - char *s = string; + const char *s = string; int column = 0; /* Divide STRING into lines. */ while (*s != 0) { - char *breakpos; + const char *breakpos; /* Find the last char that fits. */ for (breakpos = s; *breakpos && column < 78; ++breakpos) @@ -699,13 +695,11 @@ main (int argc, char **argv) char *command_line; header the_header; long name_length; - char *mail_program_name; + const char *mail_program_name; char buf[BUFLEN + 1]; register int size; FILE *the_pipe; - extern char *getenv (const char *); - mail_program_name = getenv ("FAKEMAILER"); if (!(mail_program_name && *mail_program_name)) mail_program_name = MAIL_PROGRAM_NAME; |