* doprnt.c (doprnt_lisp): Unused function deleted.

(doprnt): Merge with doprnt1, discarding lispstrings code.
* lisp.h (doprnt_lisp): Don't declare.

diff --git a/src/ChangeLog b/src/ChangeLog
index fcecdbe39f666f2b5831ebc3c74ae13efc8549cd..978d24ceb393caaf51507ad7359e96f7c9ef73ba 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-10  Ken Raeburn  <raeburn@raeburn.org>
+
+       * doprnt.c (doprnt_lisp): Unused function deleted.
+       (doprnt): Merge with doprnt1, discarding lispstrings code.
+       * lisp.h (doprnt_lisp): Don't declare.
+
 2009-08-07  Juri Linkov  <juri@jurta.org>
 
        * puresize.h (BASE_PURESIZE): Increase to 1270000.

diff --git a/src/doprnt.c b/src/doprnt.c
index 95c2d46ac54bb4aec020ebd8502124c4cb1bd8c3..95d6b789c4f08c7c3b6b4a9fc9c6da973fc0650c 100644 (file)
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -67,34 +67,6 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
      char *format_end;
      int nargs;
      char **args;
-{
-  return doprnt1 (0, buffer, bufsize, format, format_end, nargs, args);
-}
-
-/* Like doprnt except that strings in ARGS are passed
-   as Lisp_Object.  */
-
-int
-doprnt_lisp (buffer, bufsize, format, format_end, nargs, args)
-     char *buffer;
-     register int bufsize;
-     char *format;
-     char *format_end;
-     int nargs;
-     char **args;
-{
-  return doprnt1 (1, buffer, bufsize, format, format_end, nargs, args);
-}
-
-static int
-doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
-     int lispstrings;
-     char *buffer;
-     register int bufsize;
-     char *format;
-     char *format_end;
-     int nargs;
-     char **args;
 {
   int cnt = 0;                 /* Number of arg to gobble next */
   register char *fmt = format; /* Pointer into format string */
@@ -235,17 +207,8 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                error ("Not enough arguments for format string");
              if (fmtcpy[1] != 's')
                minlen = atoi (&fmtcpy[1]);
-             if (lispstrings)
-               {
-                 string = ((struct Lisp_String *) args[cnt])->data;
-                 tem = STRING_BYTES ((struct Lisp_String *) args[cnt]);
-                 cnt++;
-               }
-             else
-               {
-                 string = (unsigned char *) args[cnt++];
-                 tem = strlen (string);
-               }
+             string = (unsigned char *) args[cnt++];
+             tem = strlen (string);
              width = strwidth (string, tem);
              goto doit1;
 

diff --git a/src/lisp.h b/src/lisp.h
index 155afc870888ca16476bc9423aac437a2a6f7ebb..2aa76b4112d0344f15be67f4e2fa360a63f38382 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2681,7 +2681,6 @@ extern void syms_of_print P_ ((void));
 
 /* Defined in doprnt.c */
 extern int doprnt P_ ((char *, int, char *, char *, int, char **));
-extern int doprnt_lisp P_ ((char *, int, char *, char *, int, char **));
 
 /* Defined in lread.c */
 extern Lisp_Object Qvariable_documentation, Qstandard_input;