aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-12-09 17:44:32 -0800
committerPaul Eggert2012-12-09 17:44:32 -0800
commit5f460827dd14fbfae26ac8451cedd4446817d1ec (patch)
tree05d41f96745d814eab386b5972fa236e4452ee26
parentbad162fd1bc6134158eb097aa4ea21b881c9ef1c (diff)
downloademacs-5f460827dd14fbfae26ac8451cedd4446817d1ec.tar.gz
emacs-5f460827dd14fbfae26ac8451cedd4446817d1ec.zip
* fileio.c (Fsubstitute_in_file_name): Use ptrdiff_t, not int,
for string length.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fileio.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 222be9575b8..dd51eb9ed3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-12-10 Paul Eggert <eggert@cs.ucla.edu>
2
3 * fileio.c (Fsubstitute_in_file_name): Use ptrdiff_t, not int,
4 for string length.
5
12012-12-08 Eli Zaretskii <eliz@gnu.org> 62012-12-08 Eli Zaretskii <eliz@gnu.org>
2 7
3 * w32.c (unsetenv): Return 0 if the input string is too long. 8 * w32.c (unsetenv): Return 0 if the input string is too long.
diff --git a/src/fileio.c b/src/fileio.c
index de3b84ba95d..56c340bfa40 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1590,7 +1590,7 @@ those `/' is discarded. */)
1590{ 1590{
1591 char *nm, *s, *p, *o, *x, *endp; 1591 char *nm, *s, *p, *o, *x, *endp;
1592 char *target = NULL; 1592 char *target = NULL;
1593 int total = 0; 1593 ptrdiff_t total = 0;
1594 bool substituted = 0; 1594 bool substituted = 0;
1595 bool multibyte; 1595 bool multibyte;
1596 char *xnm; 1596 char *xnm;