summaryrefslogtreecommitdiff
path: root/src/fns.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-02-06 20:43:35 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-02-06 20:43:35 -0800
commitf1e598241997f026c8895fa045a740c34aa76093 (patch)
treecb252b2caa9ca548f21715fbcb71206345ff47ce /src/fns.c
parenta2db99828caf787cfc6da0be36052e00e8851bb3 (diff)
downloademacs-f1e598241997f026c8895fa045a740c34aa76093.tar.gz
emacs-f1e598241997f026c8895fa045a740c34aa76093.tar.bz2
emacs-f1e598241997f026c8895fa045a740c34aa76093.zip
* fns.c: conform to C89 pointer rules
Diffstat (limited to 'src/fns.c')
-rw-r--r--src/fns.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/fns.c b/src/fns.c
index e2853c2be94..e7f0bcc1218 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -882,7 +882,7 @@ string_make_multibyte (Lisp_Object string)
copy_text (SDATA (string), buf, SBYTES (string),
0, 1);
- ret = make_multibyte_string (buf, SCHARS (string), nbytes);
+ ret = make_multibyte_string ((char *) buf, SCHARS (string), nbytes);
SAFE_FREE ();
return ret;
@@ -914,7 +914,7 @@ string_to_multibyte (Lisp_Object string)
memcpy (buf, SDATA (string), SBYTES (string));
str_to_multibyte (buf, nbytes, SBYTES (string));
- ret = make_multibyte_string (buf, SCHARS (string), nbytes);
+ ret = make_multibyte_string ((char *) buf, SCHARS (string), nbytes);
SAFE_FREE ();
return ret;
@@ -940,7 +940,7 @@ string_make_unibyte (Lisp_Object string)
copy_text (SDATA (string), buf, SBYTES (string),
1, 0);
- ret = make_unibyte_string (buf, nchars);
+ ret = make_unibyte_string ((char *) buf, nchars);
SAFE_FREE ();
return ret;
@@ -996,7 +996,7 @@ If STRING is multibyte and contains a character of charset
memcpy (str, SDATA (string), bytes);
bytes = str_as_unibyte (str, bytes);
- string = make_unibyte_string (str, bytes);
+ string = make_unibyte_string ((char *) str, bytes);
xfree (str);
}
return string;
@@ -1079,7 +1079,7 @@ an error is signaled. */)
if (converted < chars)
error ("Can't convert the %dth character to unibyte", converted);
- string = make_unibyte_string (str, chars);
+ string = make_unibyte_string ((char *) str, chars);
xfree (str);
}
return string;
@@ -2982,8 +2982,8 @@ into shorter lines. */)
allength += allength / MIME_LINE_LENGTH + 1 + 6;
SAFE_ALLOCA (encoded, char *, allength);
- encoded_length = base64_encode_1 (BYTE_POS_ADDR (ibeg), encoded, length,
- NILP (no_line_break),
+ encoded_length = base64_encode_1 ((char *) BYTE_POS_ADDR (ibeg),
+ encoded, length, NILP (no_line_break),
!NILP (current_buffer->enable_multibyte_characters));
if (encoded_length > allength)
abort ();
@@ -3072,7 +3072,7 @@ base64_encode_1 (const char *from, char *to, EMACS_INT length,
{
if (multibyte)
{
- c = STRING_CHAR_AND_LENGTH (from + i, bytes);
+ c = STRING_CHAR_AND_LENGTH ((unsigned char *) from + i, bytes);
if (CHAR_BYTE8_P (c))
c = CHAR_TO_BYTE8 (c);
else if (c >= 256)
@@ -3112,7 +3112,7 @@ base64_encode_1 (const char *from, char *to, EMACS_INT length,
if (multibyte)
{
- c = STRING_CHAR_AND_LENGTH (from + i, bytes);
+ c = STRING_CHAR_AND_LENGTH ((unsigned char *) from + i, bytes);
if (CHAR_BYTE8_P (c))
c = CHAR_TO_BYTE8 (c);
else if (c >= 256)
@@ -3136,7 +3136,7 @@ base64_encode_1 (const char *from, char *to, EMACS_INT length,
if (multibyte)
{
- c = STRING_CHAR_AND_LENGTH (from + i, bytes);
+ c = STRING_CHAR_AND_LENGTH ((unsigned char *) from + i, bytes);
if (CHAR_BYTE8_P (c))
c = CHAR_TO_BYTE8 (c);
else if (c >= 256)
@@ -3183,7 +3183,8 @@ If the region can't be decoded, signal an error and don't modify the buffer. */
SAFE_ALLOCA (decoded, char *, allength);
move_gap_both (XFASTINT (beg), ibeg);
- decoded_length = base64_decode_1 (BYTE_POS_ADDR (ibeg), decoded, length,
+ decoded_length = base64_decode_1 ((char *) BYTE_POS_ADDR (ibeg),
+ decoded, length,
multibyte, &inserted_chars);
if (decoded_length > allength)
abort ();
@@ -4566,7 +4567,7 @@ guesswork fails. Normally, an error is signaled in such case. */)
(Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp_Object coding_system, Lisp_Object noerror)
{
unsigned char digest[16];
- unsigned char value[33];
+ char value[33];
int i;
EMACS_INT size;
EMACS_INT size_byte = 0;