diff options
author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-10-03 16:35:22 -0700 |
---|---|---|
committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-10-03 16:35:22 -0700 |
commit | 728a982db42d06c3c9db5f920336709387a54cda (patch) | |
tree | 1ab67f96611e906e40ae57a7e81b8d3db9b03afa /lib-src/movemail.c | |
parent | c1ae068bbb12dfadbe5f7198fa6584e9c4d7d054 (diff) | |
download | emacs-728a982db42d06c3c9db5f920336709387a54cda.tar.gz |
Fix compilation warnings.
* lib-src/test-distrib.c (cool_read):
* lib-src/movemail.c (main, concat):
* lib-src/make-docfile.c (scan_file, write_c_args):
* emacsclient.c (get_server_config): Fix -Wconversion warning.
(egetenv): Move conditional definition earlier.
(progname): Use const.
* lib-src/sorted-doc.c (xstrdup): Use const.
Diffstat (limited to 'lib-src/movemail.c')
-rw-r--r-- | lib-src/movemail.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 4ccdc93688c..f300942427e 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -169,7 +169,7 @@ main (int argc, char **argv) { char *inname, *outname; int indesc, outdesc; - int nread; + ssize_t nread; int status; int c, preserve_mail = 0; @@ -551,8 +551,7 @@ main (int argc, char **argv) string-comparing the two paths, because one or both of them might be symbolic links pointing to some other directory. */ static char * -mail_spool_name (inname) - char *inname; +mail_spool_name (char *inname) { struct stat stat1, stat2; char *indir, *fname; @@ -632,7 +631,7 @@ pfatal_and_delete (char *name) static char * concat (const char *s1, const char *s2, const char *s3) { - int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3); + size_t len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3); char *result = (char *) xmalloc (len1 + len2 + len3 + 1); strcpy (result, s1); |