martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* dired.c: conform to C89 pointer rules

Browse Source
This commit is contained in:
Paul Eggert
2011-02-06 17:18:31 -08:00
parent ef0069e9b5
commit 4f043d0f4d
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@@ -1,3 +1,11 @@
2011-02-07 Paul Eggert <eggert@cs.ucla.edu>
conform to C89 pointer rules
* dired.c (scmp, file_name_completion):
Change types between char * and unsigned char *, to satisfy C89
rules about pointer type compatibility.
2011-02-06 Paul Eggert <eggert@cs.ucla.edu>
* xterm.c (x_alloc_nearest_color_1): Avoid unportable int assumption.

18
src/dired.c
View File

@@ -99,7 +99,7 @@ Lisp_Object Qfile_name_all_completions;
Lisp_Object Qfile_attributes;
Lisp_Object Qfile_attributes_lessp;
static int scmp (const unsigned char *, const unsigned char *, int);
static int scmp (const char *, const char *, int);
#ifdef WINDOWSNT
Lisp_Object
@@ -533,7 +533,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
QUIT;
if (! DIRENTRY_NONEMPTY (dp)
|| len < SCHARS (encoded_file)
|| 0 <= scmp (dp->d_name, SDATA (encoded_file),
|| 0 <= scmp (dp->d_name, SSDATA (encoded_file),
SCHARS (encoded_file)))
continue;
@@ -558,7 +558,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
&& matchcount > 1
&& !includeall /* This match may allow includeall to 0. */
&& len >= bestmatchsize
&& 0 > scmp (dp->d_name, SDATA (bestmatch), bestmatchsize))
&& 0 > scmp (dp->d_name, SSDATA (bestmatch), bestmatchsize))
continue;
#endif
@@ -578,7 +578,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
CONSP (tem); tem = XCDR (tem))
{
int elt_len;
unsigned char *p1;
char *p1;
elt = XCAR (tem);
if (!STRINGP (elt))
@@ -589,7 +589,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
elt_len = SCHARS (elt) - 1; /* -1 for trailing / */
if (elt_len <= 0)
continue;
p1 = SDATA (elt);
p1 = SSDATA (elt);
if (p1[elt_len] != '/')
continue;
skip = len - elt_len;
@@ -619,7 +619,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
if (skip < 0) continue;
if (0 <= scmp (dp->d_name + skip,
SDATA (elt),
SSDATA (elt),
SCHARS (elt)))
continue;
break;
@@ -796,13 +796,15 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
else number of chars that match at the beginning. */
static int
scmp (const unsigned char *s1, const unsigned char *s2, int len)
scmp (const char *s1, const char *s2, int len)
{
register int l = len;
if (completion_ignore_case)
{
while (l && DOWNCASE (*s1++) == DOWNCASE (*s2++))
while (l
&& (DOWNCASE ((unsigned char) *s1++)
== DOWNCASE ((unsigned char) *s2++)))
l--;
}
else