X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/41b7f8bc6c4511ab6fcf7f6b1f9e7fdcd8592821..32ac3a6ba32f947a8d6b81ef7609dc69fd6a5d48:/src/character.c

diff --git a/src/character.c b/src/character.c
index fbd23409d0..bdb0eead74 100644
--- a/src/character.c
+++ b/src/character.c
@@ -29,6 +29,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #endif
 
+#define CHARACTER_INLINE EXTERN_INLINE
+
 #include <stdio.h>
 
 #ifdef emacs
@@ -867,8 +869,7 @@ string_escape_byte8 (Lisp_Object string)
 	  {
 	    c = STRING_CHAR_ADVANCE (src);
 	    c = CHAR_TO_BYTE8 (c);
-	    sprintf ((char *) dst, "\\%03o", c);
-	    dst += 4;
+	    dst += sprintf ((char *) dst, "\\%03o", c);
 	  }
 	else
 	  while (len--) *dst++ = *src++;
@@ -878,10 +879,7 @@ string_escape_byte8 (Lisp_Object string)
       {
 	c = *src++;
 	if (c >= 0x80)
-	  {
-	    sprintf ((char *) dst, "\\%03o", c);
-	    dst += 4;
-	  }
+	  dst += sprintf ((char *) dst, "\\%03o", c);
 	else
 	  *dst++ = c;
       }
@@ -922,16 +920,14 @@ usage: (unibyte-string &rest BYTES)  */)
   (ptrdiff_t n, Lisp_Object *args)
 {
   ptrdiff_t i;
-  unsigned char *buf, *p;
   Lisp_Object str;
   USE_SAFE_ALLOCA;
-
-  SAFE_ALLOCA (buf, unsigned char *, n);
-  p = buf;
+  unsigned char *buf = SAFE_ALLOCA (n);
+  unsigned char *p = buf;
 
   for (i = 0; i < n; i++)
     {
-      CHECK_RANGED_INTEGER (0, args[i], 255);
+      CHECK_RANGED_INTEGER (args[i], 0, 255);
       *p++ = XINT (args[i]);
     }
 
@@ -1014,12 +1010,6 @@ character is not ASCII nor 8-bit character, an error is signaled.  */)
   return make_number (c);
 }
 
-
-void
-init_character_once (void)
-{
-}
-
 #ifdef emacs
 
 void