mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 02:48:20 +00:00
riched20: Don't print the function name twice in ERR/WARN.
The ERR/WARN macros already print the function name.
This commit is contained in:
parent
643f55abab
commit
fc3e2ba954
|
@ -787,7 +787,6 @@ static void ReadFontTbl(RTF_Info *info)
|
|||
RTFFont *fp = NULL;
|
||||
char buf[rtfBufSiz], *bp;
|
||||
int old = -1;
|
||||
const char *fn = "ReadFontTbl";
|
||||
|
||||
for (;;)
|
||||
{
|
||||
|
@ -803,19 +802,19 @@ static void ReadFontTbl(RTF_Info *info)
|
|||
else if (RTFCheckCM (info, rtfGroup, rtfBeginGroup))
|
||||
old = 0; /* brace */
|
||||
else /* can't tell! */
|
||||
ERR ( "%s: Cannot determine format\n", fn);
|
||||
ERR ("cannot determine format\n");
|
||||
}
|
||||
if (old == 0) /* need to find "{" here */
|
||||
{
|
||||
if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup))
|
||||
ERR ( "%s: missing \"{\"\n", fn);
|
||||
ERR ("missing \"{\"\n");
|
||||
RTFGetToken (info); /* yes, skip to next token */
|
||||
if (info->rtfClass == rtfEOF)
|
||||
break;
|
||||
}
|
||||
fp = New (RTFFont);
|
||||
if (fp == NULL) {
|
||||
ERR ( "%s: cannot allocate font entry\n", fn);
|
||||
ERR ("cannot allocate font entry\n");
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -841,8 +840,8 @@ static void ReadFontTbl(RTF_Info *info)
|
|||
{
|
||||
default:
|
||||
/* ignore token but announce it */
|
||||
WARN ("%s: unknown token \"%s\"\n",
|
||||
fn, info->rtfTextBuf);
|
||||
WARN ("unknown token \"%s\"\n",
|
||||
info->rtfTextBuf);
|
||||
break;
|
||||
case rtfFontFamily:
|
||||
fp->rtfFFamily = info->rtfMinor;
|
||||
|
@ -903,7 +902,7 @@ static void ReadFontTbl(RTF_Info *info)
|
|||
*bp = '\0';
|
||||
fp->rtfFName = RTFStrSave (buf);
|
||||
if (fp->rtfFName == NULL)
|
||||
ERR ( "%s: cannot allocate font name\n", fn);
|
||||
ERR ("cannot allocate font name\n");
|
||||
/* already have next token; don't read one */
|
||||
/* at bottom of loop */
|
||||
continue;
|
||||
|
@ -911,8 +910,7 @@ static void ReadFontTbl(RTF_Info *info)
|
|||
else
|
||||
{
|
||||
/* ignore token but announce it */
|
||||
WARN ( "%s: unknown token \"%s\"\n",
|
||||
fn,info->rtfTextBuf);
|
||||
WARN ("unknown token \"%s\"\n", info->rtfTextBuf);
|
||||
}
|
||||
RTFGetToken (info);
|
||||
if (info->rtfClass == rtfEOF)
|
||||
|
@ -924,7 +922,7 @@ static void ReadFontTbl(RTF_Info *info)
|
|||
{
|
||||
RTFGetToken (info);
|
||||
if (!RTFCheckCM (info, rtfGroup, rtfEndGroup))
|
||||
ERR ( "%s: missing \"}\"\n", fn);
|
||||
ERR ("missing \"}\"\n");
|
||||
if (info->rtfClass == rtfEOF)
|
||||
break;
|
||||
}
|
||||
|
@ -938,7 +936,7 @@ static void ReadFontTbl(RTF_Info *info)
|
|||
}
|
||||
}
|
||||
if (!fp || (fp->rtfFNum == -1))
|
||||
ERR( "%s: missing font number\n", fn);
|
||||
ERR("missing font number\n");
|
||||
/*
|
||||
* Could check other pieces of structure here, too, I suppose.
|
||||
*/
|
||||
|
@ -967,7 +965,6 @@ static void ReadColorTbl(RTF_Info *info)
|
|||
{
|
||||
RTFColor *cp;
|
||||
int cnum = 0;
|
||||
const char *fn = "ReadColorTbl";
|
||||
int group_level = 1;
|
||||
|
||||
for (;;)
|
||||
|
@ -990,7 +987,7 @@ static void ReadColorTbl(RTF_Info *info)
|
|||
|
||||
cp = New (RTFColor);
|
||||
if (cp == NULL) {
|
||||
ERR ( "%s: cannot allocate color entry\n", fn);
|
||||
ERR ("cannot allocate color entry\n");
|
||||
break;
|
||||
}
|
||||
cp->rtfCNum = cnum++;
|
||||
|
@ -1013,7 +1010,7 @@ static void ReadColorTbl(RTF_Info *info)
|
|||
if (info->rtfClass == rtfEOF)
|
||||
break;
|
||||
if (!RTFCheckCM (info, rtfText, ';'))
|
||||
ERR ("%s: malformed entry\n", fn);
|
||||
ERR ("malformed entry\n");
|
||||
}
|
||||
RTFRouteToken (info); /* feed "}" back to router */
|
||||
}
|
||||
|
@ -1029,7 +1026,6 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
RTFStyle *sp;
|
||||
RTFStyleElt *sep, *sepLast;
|
||||
char buf[rtfBufSiz], *bp;
|
||||
const char *fn = "ReadStyleSheet";
|
||||
int real_style;
|
||||
|
||||
for (;;)
|
||||
|
@ -1041,7 +1037,7 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
break;
|
||||
sp = New (RTFStyle);
|
||||
if (sp == NULL) {
|
||||
ERR ( "%s: cannot allocate stylesheet entry\n", fn);
|
||||
ERR ("cannot allocate stylesheet entry\n");
|
||||
break;
|
||||
}
|
||||
sp->rtfSName = NULL;
|
||||
|
@ -1055,7 +1051,7 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
sp->rtfExpanding = 0;
|
||||
info->styleList = sp;
|
||||
if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup))
|
||||
ERR ( "%s: missing \"{\"\n", fn);
|
||||
ERR ("missing \"{\"\n");
|
||||
real_style = TRUE;
|
||||
for (;;)
|
||||
{
|
||||
|
@ -1067,7 +1063,7 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
{
|
||||
if (RTFCheckMM (info, rtfSpecialChar, rtfOptDest)) {
|
||||
RTFGetToken(info);
|
||||
ERR( "%s: skipping optional destination\n", fn);
|
||||
ERR("skipping optional destination\n");
|
||||
RTFSkipGroup(info);
|
||||
info->rtfClass = rtfGroup;
|
||||
info->rtfMajor = rtfEndGroup;
|
||||
|
@ -1110,7 +1106,7 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
sep = New (RTFStyleElt);
|
||||
if (sep == NULL)
|
||||
{
|
||||
ERR ( "%s: cannot allocate style element\n", fn);
|
||||
ERR ("cannot allocate style element\n");
|
||||
break;
|
||||
}
|
||||
sep->rtfSEClass = info->rtfClass;
|
||||
|
@ -1119,7 +1115,7 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
sep->rtfSEParam = info->rtfParam;
|
||||
sep->rtfSEText = RTFStrSave (info->rtfTextBuf);
|
||||
if (sep->rtfSEText == NULL)
|
||||
ERR ( "%s: cannot allocate style element text\n", fn);
|
||||
ERR ("cannot allocate style element text\n");
|
||||
if (sepLast == NULL)
|
||||
sp->rtfSSEList = sep; /* first element */
|
||||
else /* add to end */
|
||||
|
@ -1133,7 +1129,7 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
* This passes over "{\*\keycode ... }, among
|
||||
* other things. A temporary (perhaps) hack.
|
||||
*/
|
||||
ERR( "%s: skipping begin\n", fn);
|
||||
ERR("skipping begin\n");
|
||||
RTFSkipGroup (info);
|
||||
continue;
|
||||
}
|
||||
|
@ -1154,19 +1150,18 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
*bp = '\0';
|
||||
sp->rtfSName = RTFStrSave (buf);
|
||||
if (sp->rtfSName == NULL)
|
||||
ERR ( "%s: cannot allocate style name\n", fn);
|
||||
ERR ("cannot allocate style name\n");
|
||||
}
|
||||
else /* unrecognized */
|
||||
{
|
||||
/* ignore token but announce it */
|
||||
WARN ( "%s: unknown token \"%s\"\n",
|
||||
fn, info->rtfTextBuf);
|
||||
WARN ("unknown token \"%s\"\n", info->rtfTextBuf);
|
||||
}
|
||||
}
|
||||
if (real_style) {
|
||||
RTFGetToken (info);
|
||||
if (!RTFCheckCM (info, rtfGroup, rtfEndGroup))
|
||||
ERR ( "%s: missing \"}\"\n", fn);
|
||||
ERR ("missing \"}\"\n");
|
||||
/*
|
||||
* Check over the style structure. A name is a must.
|
||||
* If no style number was specified, check whether it's the
|
||||
|
@ -1178,12 +1173,12 @@ static void ReadStyleSheet(RTF_Info *info)
|
|||
* Some German RTF writers use "Standard" instead of "Normal".
|
||||
*/
|
||||
if (sp->rtfSName == NULL)
|
||||
ERR ( "%s: missing style name\n", fn);
|
||||
ERR ("missing style name\n");
|
||||
if (sp->rtfSNum < 0)
|
||||
{
|
||||
if (strncmp (buf, "Normal", 6) != 0
|
||||
&& strncmp (buf, "Standard", 8) != 0)
|
||||
ERR ( "%s: missing style number\n", fn);
|
||||
ERR ("missing style number\n");
|
||||
sp->rtfSNum = rtfNormalStyleNum;
|
||||
}
|
||||
if (sp->rtfSNextPar == -1) /* if \snext not given, */
|
||||
|
|
Loading…
Reference in a new issue