From: Ben Pfaff Date: Sat, 3 Dec 2016 06:23:12 +0000 (-0800) Subject: gui: Remove unused static variables. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d849605f7d1abf4a881faec40572f536859d6c19;p=pspp gui: Remove unused static variables. Reported by GCC 6.2.1. --- diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 8832e5175e..59099a153e 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2006, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation + Copyright (C) 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2016 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -542,17 +542,6 @@ psppire_data_store_get_reader (PsppireDataStore *ds) return reader; } - - -/* Column related funcs */ - - -static const gchar null_var_name[]=N_("var"); - - - - - /* Returns the CASENUMth case, or a null pointer on failure. */ struct ccase * diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 20f5130e81..ddfdfbcb81 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -145,31 +145,7 @@ struct icon_size size_t n_sizes; /* The number of items in the array below. */ const GtkIconSize *usage; /* An array determining for what the icon set is used */ }; - -static const GtkIconSize menus[] = {GTK_ICON_SIZE_MENU}; -static const GtkIconSize large_toolbar[] = {GTK_ICON_SIZE_LARGE_TOOLBAR}; -static const GtkIconSize small_toolbar[] = {GTK_ICON_SIZE_SMALL_TOOLBAR}; - - -/* We currently have three icon sets viz: 16x16, 24x24 and 32x32 - We use the 16x16 for menus, the 32x32 for the large_toolbars and - the 24x24 for small_toolbars. - - The order of this array is pertinent. The icons in the sets occuring - earlier in the array will be used a the wildcard (default) icon size, - if such an icon exists. -*/ -static const struct icon_size sizemap[] = - { - {24, sizeof (small_toolbar) / sizeof (GtkIconSize), small_toolbar}, - {16, sizeof (menus) / sizeof (GtkIconSize), menus}, - {32, sizeof (large_toolbar) / sizeof (GtkIconSize), large_toolbar} - }; - - - - static void handle_msg (const struct msg *m_, void *lexer_) {