From 5eb9f461ffc6ee3b593f727dcbe05bcdc77bde57 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Mon, 7 Oct 2013 10:32:39 +0200 Subject: [PATCH] Purge remaining references to PerlIO_sprintf and PerlIO_vsprintf(). Eliminate their function prototypes. Eliminate references in perlio.sym and makedef.pl which caused them to still be added to the Win32 linker definitions. --- makedef.pl | 3 --- perlio.h | 4 ---- perlio.sym | 2 -- perliol.h | 2 -- perlsfio.h | 1 - 5 files changed, 12 deletions(-) diff --git a/makedef.pl b/makedef.pl index cd0d3fec40..5c4985933c 100644 --- a/makedef.pl +++ b/makedef.pl @@ -677,7 +677,6 @@ if ($define{'USE_PERLIO'}) { PerlIO_set_cnt PerlIO_set_ptrcnt PerlIO_setlinebuf - PerlIO_sprintf PerlIO_stderr PerlIO_stdin PerlIO_stdout @@ -805,9 +804,7 @@ try_symbols(qw( PerlIO_getpos PerlIO_init PerlIO_setpos - PerlIO_sprintf PerlIO_tmpfile - PerlIO_vsprintf )); if ($ARGS{PLATFORM} eq 'win32') { diff --git a/perlio.h b/perlio.h index 69f0476731..c55cbf6159 100644 --- a/perlio.h +++ b/perlio.h @@ -281,10 +281,6 @@ PERL_EXPORT_C void PerlIO_setlinebuf(PerlIO *); PERL_EXPORT_C int PerlIO_printf(PerlIO *, const char *, ...) __attribute__format__(__printf__, 2, 3); #endif -#ifndef PerlIO_sprintf -PERL_EXPORT_C int PerlIO_sprintf(char *, int, const char *, ...) - __attribute__format__(__printf__, 3, 4); -#endif #ifndef PerlIO_vprintf PERL_EXPORT_C int PerlIO_vprintf(PerlIO *, const char *, va_list); #endif diff --git a/perlio.sym b/perlio.sym index bca044cc27..30c3f61a54 100644 --- a/perlio.sym +++ b/perlio.sym @@ -21,10 +21,8 @@ PerlIO_releaseFILE PerlIO_reopen PerlIO_rewind PerlIO_setpos -PerlIO_sprintf PerlIO_stdoutf PerlIO_teardown PerlIO_tmpfile PerlIO_ungetc PerlIO_vprintf -PerlIO_vsprintf diff --git a/perliol.h b/perliol.h index c667f1f5eb..82a3840eff 100644 --- a/perliol.h +++ b/perliol.h @@ -158,8 +158,6 @@ PERL_EXPORT_C PerlIO_list_t * PerlIO_resolve_layers(pTHX_ const char *layers, co PERL_EXPORT_C PerlIO_funcs * PerlIO_default_layer(pTHX_ I32 n); PERL_EXPORT_C PerlIO_list_t * PerlIO_default_layers(pTHX); PERL_EXPORT_C PerlIO * PerlIO_reopen(const char *path, const char *mode, PerlIO *f); -PERL_EXPORT_C int PerlIO_vsprintf(char *s, int n, const char *fmt, va_list ap) - __attribute__format__(__printf__,3,0); PERL_EXPORT_C PerlIO_list_t *PerlIO_list_alloc(pTHX); PERL_EXPORT_C PerlIO_list_t *PerlIO_clone_list(pTHX_ PerlIO_list_t *proto, CLONE_PARAMS *param); diff --git a/perlsfio.h b/perlsfio.h index 66ec10fdbd..05c81a6fa4 100644 --- a/perlsfio.h +++ b/perlsfio.h @@ -43,7 +43,6 @@ extern int _stdprintf _ARG_((const char*, ...)); #define PerlIO_puts(f,s) sfputr(f,s,-1) #define PerlIO_putc(f,c) sfputc(f,c) #define PerlIO_ungetc(f,c) sfungetc(f,c) -#define PerlIO_sprintf sfsprintf #define PerlIO_getc(f) sfgetc(f) #define PerlIO_eof(f) sfeof(f) #define PerlIO_error(f) sferror(f)