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

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

src/ChangeLog

+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.

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;
 

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;