From: Christophe CURIS <christophe.cu...@free.fr>
---
util/convertfonts.c | 2 +-
util/fontconv.c | 2 +-
util/geticonset.c | 2 +-
util/getstyle.c | 6 +++---
util/seticons.c | 2 +-
util/setstyle.c | 8 ++++----
util/wdread.c | 2 +-
util/wdwrite.c | 2 +-
util/wmagnify.c | 4 ++--
util/wmsetbg.c | 30 +++++++++++++++---------------
util/wxcopy.c | 2 +-
util/wxpaste.c | 6 +++---
12 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/util/convertfonts.c b/util/convertfonts.c
index 05ce900..4a22fcc 100644
--- a/util/convertfonts.c
+++ b/util/convertfonts.c
@@ -54,7 +54,7 @@ char *FontOptions[] = {
extern char *__progname;
-void print_help(int print_usage, int exitval)
+static void print_help(int print_usage, int exitval)
{
printf("Usage: %s [-h] [-v] [--keep-xlfd] <style_file>\n", __progname);
if (print_usage) {
diff --git a/util/fontconv.c b/util/fontconv.c
index 962fb39..31dde46 100644
--- a/util/fontconv.c
+++ b/util/fontconv.c
@@ -135,7 +135,7 @@ static char *mapSlantToName(str * slant)
}
}
-char *xlfdToFc(const char *xlfd, const char *useFamily, Bool keepXLFD)
+static char *xlfdToFc(const char *xlfd, const char *useFamily, Bool keepXLFD)
{
str *tokens, *family, *weight, *slant;
char *name, buf[64];
diff --git a/util/geticonset.c b/util/geticonset.c
index 6ebac81..98c9b9d 100644
--- a/util/geticonset.c
+++ b/util/geticonset.c
@@ -34,7 +34,7 @@
extern char *__progname;
-void print_help(int print_usage, int exitval)
+static void print_help(int print_usage, int exitval)
{
printf("Usage: %s [-h] [-v] [file]\n", __progname);
if (print_usage) {
diff --git a/util/getstyle.c b/util/getstyle.c
index b0679a6..ad7a493 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -138,7 +138,7 @@ WMPropList *PixmapPath = NULL;
char *ThemePath = NULL;
-void print_help(int print_usage, int exitval)
+static void print_help(int print_usage, int exitval)
{
printf("Usage: %s [-t] [-p] [-h] [-v] [file]\n", __progname);
if (print_usage) {
@@ -165,7 +165,7 @@ static Bool isFontOption(const char *option)
return False;
}
-void findCopyFile(const char *dir, const char *file)
+static void findCopyFile(const char *dir, const char *file)
{
char *fullPath;
@@ -179,7 +179,7 @@ void findCopyFile(const char *dir, const char *file)
free(fullPath);
}
-void makeThemePack(WMPropList * style, const char *themeName)
+static void makeThemePack(WMPropList * style, const char *themeName)
{
WMPropList *keys;
WMPropList *key;
diff --git a/util/seticons.c b/util/seticons.c
index d70b828..b64d168 100644
--- a/util/seticons.c
+++ b/util/seticons.c
@@ -34,7 +34,7 @@
extern char *__progname;
-void print_help(int print_usage, int exitval)
+static void print_help(int print_usage, int exitval)
{
printf("Usage: %s [-h] [-v] [file]\n", __progname);
if (print_usage) {
diff --git a/util/setstyle.c b/util/setstyle.c
index 42b42f8..7f99b6f 100644
--- a/util/setstyle.c
+++ b/util/setstyle.c
@@ -110,7 +110,7 @@ static Bool isFontOption(const char *option)
* that qualifies the external references to be absolute, possibly
* pending further expansion
*/
-void hackPathInTexture(WMPropList * texture, const char *prefix)
+static void hackPathInTexture(WMPropList * texture, const char *prefix)
{
WMPropList *type;
char *t;
@@ -158,7 +158,7 @@ void hackPathInTexture(WMPropList * texture, const char
*prefix)
}
}
-void hackPaths(WMPropList * style, const char *prefix)
+static void hackPaths(WMPropList * style, const char *prefix)
{
WMPropList *keys;
WMPropList *key;
@@ -263,7 +263,7 @@ static WMPropList *getColor(WMPropList * texture)
* IconTitleColor
* IconTitleBack
*/
-void hackStyle(WMPropList * style)
+static void hackStyle(WMPropList * style)
{
WMPropList *keys, *tmp;
int foundIconTitle = 0, foundResizebarBack = 0;
@@ -350,7 +350,7 @@ void hackStyle(WMPropList * style)
}
}
-void print_help(int print_usage, int exitval)
+static void print_help(int print_usage, int exitval)
{
printf("Usage: %s [OPTIONS] FILE\n", __progname);
if (print_usage) {
diff --git a/util/wdread.c b/util/wdread.c
index 25d41ee..832b1f6 100644
--- a/util/wdread.c
+++ b/util/wdread.c
@@ -41,7 +41,7 @@
extern char *__progname;
-void print_help(int print_usage, int exitval)
+static void print_help(int print_usage, int exitval)
{
printf("Usage: %s [OPTIONS] <domain> <key>\n", __progname);
if (print_usage) {
diff --git a/util/wdwrite.c b/util/wdwrite.c
index e494c0a..a2bb61f 100644
--- a/util/wdwrite.c
+++ b/util/wdwrite.c
@@ -41,7 +41,7 @@
extern char *__progname;
-void print_help(int print_usage, int exitval)
+static void print_help(int print_usage, int exitval)
{
printf("Usage: %s [OPTIONS] <domain> <key> <value>\n", __progname);
if (print_usage) {
diff --git a/util/wmagnify.c b/util/wmagnify.c
index f77cf10..f310bc7 100644
--- a/util/wmagnify.c
+++ b/util/wmagnify.c
@@ -275,7 +275,7 @@ static void update(void *d)
data->tid = WMAddTimerHandler(data->refreshrate, update, data);
}
-void resizedWindow(void *d, WMNotification * notif)
+static void resizedWindow(void *d, WMNotification * notif)
{
BufferData *data = (BufferData *) d;
WMView *view = (WMView *) WMGetNotificationObject(notif);
@@ -286,7 +286,7 @@ void resizedWindow(void *d, WMNotification * notif)
resizeBufferData(data, size.width, size.height, data->magfactor);
}
-void closeWindow(WMWidget * w, void *d)
+static void closeWindow(WMWidget * w, void *d)
{
BufferData *data = (BufferData *) d;
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index 95d4016..8c15ea1 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -96,7 +96,7 @@ typedef struct BackgroundTexture {
int height;
} BackgroundTexture;
-void initXinerama(void)
+static void initXinerama(void)
{
xineInfo.screens = NULL;
xineInfo.count = 0;
@@ -140,7 +140,7 @@ void initXinerama(void)
#endif /* XINERAMA */
}
-RImage *loadImage(RContext * rc, const char *file)
+static RImage *loadImage(RContext * rc, const char *file)
{
char *path;
RImage *image;
@@ -257,7 +257,7 @@ applyImage(RContext * rc, BackgroundTexture * texture,
RImage * image, char type
}
}
-BackgroundTexture *parseTexture(RContext * rc, char *text)
+static BackgroundTexture *parseTexture(RContext * rc, char *text)
{
BackgroundTexture *texture = NULL;
WMPropList *texarray;
@@ -687,7 +687,7 @@ BackgroundTexture *parseTexture(RContext * rc, char *text)
return NULL;
}
-void freeTexture(BackgroundTexture * texture)
+static void freeTexture(BackgroundTexture * texture)
{
if (texture->solid) {
unsigned long pixel[1];
@@ -705,7 +705,7 @@ void freeTexture(BackgroundTexture * texture)
wfree(texture);
}
-void setupTexture(RContext * rc, BackgroundTexture ** textures, int
*maxTextures, int workspace, char *texture)
+static void setupTexture(RContext * rc, BackgroundTexture ** textures, int
*maxTextures, int workspace, char *texture)
{
BackgroundTexture *newTexture = NULL;
int i;
@@ -758,7 +758,7 @@ void setupTexture(RContext * rc, BackgroundTexture **
textures, int *maxTextures
*maxTextures = workspace;
}
-Pixmap duplicatePixmap(Pixmap pixmap, int width, int height)
+static Pixmap duplicatePixmap(Pixmap pixmap, int width, int height)
{
Display *tmpDpy;
Pixmap copyP;
@@ -789,7 +789,7 @@ static int dummyErrorHandler(Display * dpy, XErrorEvent *
err)
return 0;
}
-void setPixmapProperty(Pixmap pixmap)
+static void setPixmapProperty(Pixmap pixmap)
{
static Atom prop = 0;
Atom type;
@@ -826,7 +826,7 @@ void setPixmapProperty(Pixmap pixmap)
XFlush(dpy);
}
-void changeTexture(BackgroundTexture * texture)
+static void changeTexture(BackgroundTexture * texture)
{
if (!texture) {
return;
@@ -850,7 +850,7 @@ void changeTexture(BackgroundTexture * texture)
}
}
-int readmsg(int fd, char *buffer, int size)
+static int readmsg(int fd, char *buffer, int size)
{
int count;
@@ -876,7 +876,7 @@ int readmsg(int fd, char *buffer, int size)
* n is 4 bytes
* size = 4 bytes for length of the message data
*/
-void helperLoop(RContext * rc)
+static void helperLoop(RContext * rc)
{
BackgroundTexture *textures[WORKSPACE_COUNT];
int maxTextures = 0;
@@ -974,7 +974,7 @@ void helperLoop(RContext * rc)
}
}
-void updateDomain(const char *domain, const char *key, const char *texture)
+static void updateDomain(const char *domain, const char *key, const char
*texture)
{
char *program = "wdwrite";
@@ -1043,7 +1043,7 @@ static WMPropList *getValueForKey(const char *domain,
const char *keyName)
return val;
}
-char *getPixmapPath(const char *domain)
+static char *getPixmapPath(const char *domain)
{
WMPropList *val;
char *ptr, *data;
@@ -1094,7 +1094,7 @@ char *getPixmapPath(const char *domain)
return data;
}
-char *getFullPixmapPath(const char *file)
+static char *getFullPixmapPath(const char *file)
{
char *tmp;
@@ -1127,7 +1127,7 @@ void wAbort(void)
exit(1);
}
-void print_help(void)
+static void print_help(void)
{
printf("Usage: %s [options] [image]\n", __progname);
puts("Sets the workspace background to the specified image or a texture
and");
@@ -1155,7 +1155,7 @@ void print_help(void)
puts(" -h, --help show this help and exit");
}
-void changeTextureForWorkspace(const char *domain, char *texture, int
workspace)
+static void changeTextureForWorkspace(const char *domain, char *texture, int
workspace)
{
WMPropList *array, *val;
char *value;
diff --git a/util/wxcopy.c b/util/wxcopy.c
index 6934d5c..89bd4a1 100644
--- a/util/wxcopy.c
+++ b/util/wxcopy.c
@@ -33,7 +33,7 @@
extern char *__progname;
-void print_help(void)
+static void print_help(void)
{
printf("Usage: %s [OPTIONS] [FILE]\n", __progname);
puts("Copies data from FILE or stdin into X cut buffer.");
diff --git a/util/wxpaste.c b/util/wxpaste.c
index 7261052..0713308 100644
--- a/util/wxpaste.c
+++ b/util/wxpaste.c
@@ -37,7 +37,7 @@
extern char *__progname;
-void print_help(void)
+static void print_help(void)
{
printf("Usage: %s [OPTIONS] [FILE]\n", __progname);
puts("Copies data from X selection or cutbuffer to FILE or stdout.");
@@ -49,7 +49,7 @@ void print_help(void)
puts(" -v, --version output version information and exit");
}
-Time getTimestamp(Display * dpy, Window win)
+static Time getTimestamp(Display * dpy, Window win)
{
XEvent ev;
@@ -81,7 +81,7 @@ Time getTimestamp(Display * dpy, Window win)
return ev.xproperty.time;
}
-char *fetchSelection(Display * dpy, const char *selection, const char
*progName)
+static char *fetchSelection(Display * dpy, const char *selection, const char
*progName)
{
Atom selatom = XInternAtom(dpy, selection, False);
Atom clipatom = XInternAtom(dpy, "CLIPBOARD", False);
--
1.7.10.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
