Module: wine Branch: master Commit: 1914d256a6e055f243bf2ad8ea10406538e956cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1914d256a6e055f243bf2ad8ea...
Author: Francois Gouget fgouget@free.fr Date: Tue May 26 00:47:29 2009 +0200
riched20: RTF{G,S}et{In,Out}putName() are unused so remove them as well as the corresponding _RTF_Info fields.
---
dlls/riched20/reader.c | 37 ------------------------------------- dlls/riched20/rtf.h | 7 ------- 2 files changed, 0 insertions(+), 44 deletions(-)
diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index fa1ef79..10aa19e 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -226,10 +226,6 @@ void RTFInit(RTF_Info *info) info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; }
- heap_free (info->inputName); - heap_free (info->outputName); - info->inputName = info->outputName = NULL; - for (i = 0; i < rtfMaxClass; i++) RTFSetClassCallback (info, i, NULL); for (i = 0; i < rtfMaxDestination; i++) @@ -278,39 +274,6 @@ void RTFInit(RTF_Info *info) }
/* - * Set or get the input or output file name. These are never guaranteed - * to be accurate, only insofar as the calling program makes them so. - */ - -void RTFSetInputName(RTF_Info *info, const char *name) -{ - info->inputName = RTFStrSave (name); - if (info->inputName == NULL) - ERR ("RTFSetInputName: out of memory\n"); -} - - -char *RTFGetInputName(const RTF_Info *info) -{ - return (info->inputName); -} - - -void RTFSetOutputName(RTF_Info *info, const char *name) -{ - info->outputName = RTFStrSave (name); - if (info->outputName == NULL) - ERR ("RTFSetOutputName: out of memory\n"); -} - - -char *RTFGetOutputName(const RTF_Info *info) -{ - return (info->outputName); -} - - -/* * Install or return a writer callback for a destination type */
diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 6de440f..e8cfb34 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1152,9 +1152,6 @@ struct _RTF_Info { int unicodeLength; /* The length of ANSI representation of Unicode characters */ int codePage; /* Current codepage for text conversion */
- char *inputName; - char *outputName; - ME_InStream *stream;
ME_TextEditor *editor; @@ -1191,10 +1188,6 @@ struct _RTF_Info {
void RTFInit (RTF_Info *); void RTFDestroy(RTF_Info *info); -void RTFSetInputName (RTF_Info *, const char *); -char *RTFGetInputName (const RTF_Info *); -void RTFSetOutputName (RTF_Info *, const char *); -char *RTFGetOutputName (const RTF_Info *); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */