From 4d15dbb1ac524a017e9812fb7f21f032ccbc2ae1 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Wed, 21 Jan 2009 16:04:57 -0200 Subject: Ansification and compile warning fixes. This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects make distcheck and all gcc 4.3 and sparse warnings. --- xfontsel.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'xfontsel.c') diff --git a/xfontsel.c b/xfontsel.c index 206a90b..3b8f0aa 100644 --- a/xfontsel.c +++ b/xfontsel.c @@ -83,11 +83,11 @@ void EnableMenu(XtPointer closure); void SetCurrentFont(XtPointer closure); void QuitAction(Widget w, XEvent *event, String *params, Cardinal *num_params); -XtActionsRec xfontsel_actions[] = { +static XtActionsRec xfontsel_actions[] = { {"Quit", QuitAction} }; -Atom wm_delete_window; +static Atom wm_delete_window; Boolean IsXLFDFontName(String fontName); @@ -234,28 +234,28 @@ static void SetCurrentFontCount(void); static void SetNoFonts(void); static void SetParsingFontCount(int count); -XtAppContext appCtx; -int numFonts; -int numBadFonts; -FontValues *fonts; -int *scaledFonts; -int numScaledFonts; -FieldValueList *fieldValues[FIELD_COUNT]; -FontValues currentFont; -int matchingFontCount; +static XtAppContext appCtx; +static int numFonts; +static int numBadFonts; +static FontValues *fonts; +static int *scaledFonts; +static int numScaledFonts; +static FieldValueList *fieldValues[FIELD_COUNT]; +static FontValues currentFont; +static int matchingFontCount; static Boolean anyDisabled = False; -Widget ownButton; -Widget fieldBox; -Widget countLabel; -Widget currentFontName; -String currentFontNameString; -int currentFontNameSize; -Widget sampleText; -int textEncoding = -1; +static Widget ownButton; +static Widget fieldBox; +static Widget countLabel; +static Widget currentFontName; +static String currentFontNameString; +static int currentFontNameSize; +static Widget sampleText; +static int textEncoding = -1; static XFontStruct *sampleFont = NULL; -Boolean *fontInSet; +static Boolean *fontInSet; static Choice *choiceList = NULL; -int enabledMenuIndex; +static int enabledMenuIndex; static Boolean patternFieldSpecified[FIELD_COUNT]; /* = 0 */ int -- cgit v1.2.3