diff options
author | Ken Raeburn <raeburn@raeburn.org> | 2009-08-10 00:54:02 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@raeburn.org> | 2009-08-10 00:54:02 +0000 |
commit | e267324c1cc5853954a2df0d23c62ca9c28b1516 (patch) | |
tree | ef073476d3547a08d5f47f24fb664a708c249013 /src/doprnt.c | |
parent | 4c39f404d52c888bd314a3ffed4c6306537343fe (diff) | |
download | emacs-e267324c1cc5853954a2df0d23c62ca9c28b1516.tar.gz |
* doprnt.c (doprnt_lisp): Unused function deleted.
(doprnt): Merge with doprnt1, discarding lispstrings code.
* lisp.h (doprnt_lisp): Don't declare.
Diffstat (limited to 'src/doprnt.c')
-rw-r--r-- | src/doprnt.c | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/src/doprnt.c b/src/doprnt.c index 95c2d46ac54..95d6b789c4f 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -68,34 +68,6 @@ doprnt (buffer, bufsize, format, format_end, nargs, args) 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 */ register char *bufptr = buffer; /* Pointer into output buffer.. */ @@ -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; |