Cleaned up a few errors, at least here now it will compile with
CFLAGS="-g -O2 -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter
-Wno-type-limits -Wno-comment -Wno-missing-field-initializers
-Wno-strict-overflow -Werror".
The fixes are mostly printf format strings, with a few uninitialized
pointers thrown in for good measure. In particular, this happened more
than once, which will fail if "something" is false and the stack garbage
initializing "p" is not NULL:
void *p;
if (something)
p = somethingMaybeReturningNull();
if (!p)
p = somethingElse();
diff --git a/WINGs/dragcommon.c b/WINGs/dragcommon.c
index feb2e87..7c9a6a0 100644
--- a/WINGs/dragcommon.c
+++ b/WINGs/dragcommon.c
@@ -135,7 +135,7 @@ W_SendDnDClientMessage(Display * dpy, Window win, Atom
message,
#endif
if (!windowExists(dpy, win)) {
- wwarning("xdnd message target %d does no longer exist.", win);
+ wwarning("xdnd message target %ld does no longer exist.", win);
return False; /* message not sent */
}
diff --git a/WINGs/proplist.c b/WINGs/proplist.c
index 476fa65..7d6d3c4 100644
--- a/WINGs/proplist.c
+++ b/WINGs/proplist.c
@@ -1746,4 +1746,5 @@ int wrmdirhier(const char *path)
}
+ return 1;
}
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 106a306..9107514 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -544,7 +544,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList *
texture, int width, int
int style;
RColor rcolor2;
int i;
- RImage *grad, *timage;
+ RImage *grad, *timage = NULL;
char *path;
switch (toupper(type[1])) {
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index 6f4fdf4..42ffd64 100644
--- a/WPrefs.app/Configurations.c
+++ b/WPrefs.app/Configurations.c
@@ -135,7 +135,7 @@ createImages(WMScreen *scr, RContext *rc, RImage *xis, char
*file,
if (xis) {
RCombineImagesWithOpaqueness(icon, xis, 180);
if (!(*icon2 = WMCreatePixmapFromRImage(scr, icon, 127)))
- wwarning(_("could not process icon %s:"), file,
RMessageForError(RErrorCode));
+ wwarning(_("could not process icon %s: %s"), file,
RMessageForError(RErrorCode));
}
RReleaseImage(icon);
wfree(path);
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index ab24061..418680e 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -25,6 +25,7 @@
#include <X11/Xutil.h>
+#include <unistd.h>
#include <math.h>
/* double-click tester */
diff --git a/WPrefs.app/Paths.c b/WPrefs.app/Paths.c
index ca1b353..c5cb10d 100644
--- a/WPrefs.app/Paths.c
+++ b/WPrefs.app/Paths.c
@@ -154,6 +154,7 @@ static void browseForFile(WMWidget * w, void *data)
lPtr = panel->icoL;
else if (w == panel->pixaB)
lPtr = panel->pixL;
+ else return;
i = WMGetListSelectedItemRow(lPtr);
if (i >= 0)
diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c
index e4fcf74..c9569e9 100644
--- a/WPrefs.app/Workspace.c
+++ b/WPrefs.app/Workspace.c
@@ -99,7 +99,7 @@ createImages(WMScreen * scr, RContext * rc, RImage * xis,
char *file, WMPixmap *
if (xis) {
RCombineImagesWithOpaqueness(icon, xis, 180);
if (!(*icon2 = WMCreatePixmapFromRImage(scr, icon, 127))) {
- wwarning(_("could not process icon %s:"), file,
RMessageForError(RErrorCode));
+ wwarning(_("could not process icon %s: %s"), file,
RMessageForError(RErrorCode));
*icon2 = NULL;
}
}
diff --git a/WPrefs.app/po/bg.po b/WPrefs.app/po/bg.po
index d2a7da9..17c0e91 100644
--- a/WPrefs.app/po/bg.po
+++ b/WPrefs.app/po/bg.po
@@ -300,8 +300,8 @@ msgstr "не може да се зареди иконката %s"
# ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "не може да се обработи иконката %s:"
+msgid "could not process icon %s: %s"
+msgstr "не може да се обработи иконката %s: %s"
# ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
diff --git a/WPrefs.app/po/ca.po b/WPrefs.app/po/ca.po
index 98955f5..b6782d2 100644
--- a/WPrefs.app/po/ca.po
+++ b/WPrefs.app/po/ca.po
@@ -241,8 +241,8 @@ msgstr "no s'ha pogut carregar el fitxer d'icona %s"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "no s'ha pogut processar l'icona %s:"
+msgid "could not process icon %s: %s"
+msgstr "no s'ha pogut processar l'icona %s: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/cs.po b/WPrefs.app/po/cs.po
index 5259164..2e5d75b 100644
--- a/WPrefs.app/po/cs.po
+++ b/WPrefs.app/po/cs.po
@@ -234,8 +234,8 @@ msgstr "nelze načíst ikonu %s"
#: ../Configurations.c:164 ../Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "nelze zpracovat ikonu %s:"
+msgid "could not process icon %s: %s"
+msgstr "nelze zpracovat ikonu %s: %s"
#: ../Configurations.c:189 ../Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/de.po b/WPrefs.app/po/de.po
index 9013518..07ad9b7 100644
--- a/WPrefs.app/po/de.po
+++ b/WPrefs.app/po/de.po
@@ -244,7 +244,7 @@ msgstr "Symboldatei %s konnte nicht geöffnet werden"
#: ../../WPrefs.app/Configurations.c:138 ../../WPrefs.app/Workspace.c:102
#, c-format
-msgid "could not process icon %s:"
+msgid "could not process icon %s: %s"
msgstr "Symboldatei %s konnte nicht verarbeitet werden"
#: ../../WPrefs.app/Configurations.c:160 ../../WPrefs.app/Workspace.c:151
diff --git a/WPrefs.app/po/es.po b/WPrefs.app/po/es.po
index 734370a..3f80fc9 100644
--- a/WPrefs.app/po/es.po
+++ b/WPrefs.app/po/es.po
@@ -231,8 +231,8 @@ msgstr "no puedo cargar el icono %s"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "no puedo procesar el icono %s:"
+msgid "could not process icon %s: %s"
+msgstr "no puedo procesar el icono %s: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/fi.po b/WPrefs.app/po/fi.po
index 960370c..cf11194 100644
--- a/WPrefs.app/po/fi.po
+++ b/WPrefs.app/po/fi.po
@@ -445,8 +445,8 @@ msgstr "kuvakkeen %s lataus ei onnistunut"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "ei voitu käsitellä kuvaketta %s:"
+msgid "could not process icon %s: %s"
+msgstr "ei voitu käsitellä kuvaketta %s: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/fr.po b/WPrefs.app/po/fr.po
index 0b5cb2e..5478166 100644
--- a/WPrefs.app/po/fr.po
+++ b/WPrefs.app/po/fr.po
@@ -236,8 +236,8 @@ msgstr "Le chargement de l'icône %s a échoué."
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "Le traitement de l'icône %s a échoué : "
+msgid "could not process icon %s: %s"
+msgstr "Le traitement de l'icône %s a échoué : %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/hr.po b/WPrefs.app/po/hr.po
index a687660..fa193c9 100644
--- a/WPrefs.app/po/hr.po
+++ b/WPrefs.app/po/hr.po
@@ -18,8 +18,8 @@ msgid "could not load icon %s"
msgstr "ne mogu učitati ikonu %s"
#: ../../WPrefs/Configurations.c:156 ../../WPrefs/Workspace.c:85
-msgid "could not process icon %s:"
-msgstr "ne mogu procesirati ikonu %s"
+msgid "could not process icon %s: %s"
+msgstr "ne mogu procesirati ikonu %s: %s"
#: ../../WPrefs/Configurations.c:181 ../../WPrefs/Workspace.c:124
msgid "could not load image file %s"
diff --git a/WPrefs.app/po/hu.po b/WPrefs.app/po/hu.po
index be44d9e..3887aa3 100644
--- a/WPrefs.app/po/hu.po
+++ b/WPrefs.app/po/hu.po
@@ -387,8 +387,8 @@ msgid "could not load icon %s"
msgstr "a %s ikont nem tudom betölteni"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:87
-msgid "could not process icon %s:"
-msgstr "a %s ikont nem tudom feldolgozni:"
+msgid "could not process icon %s: %s"
+msgstr "a %s ikont nem tudom feldolgozni: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:126
msgid "could not load image file %s"
diff --git a/WPrefs.app/po/it.po b/WPrefs.app/po/it.po
index 1345212..1bcf2a7 100644
--- a/WPrefs.app/po/it.po
+++ b/WPrefs.app/po/it.po
@@ -447,8 +447,8 @@ msgstr "Impossibile caricare l'icona %s"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "Impossibile elaborare l'icona %s:"
+msgid "could not process icon %s: %s"
+msgstr "Impossibile elaborare l'icona %s: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/ja.po b/WPrefs.app/po/ja.po
index 14a5af4..4e0fe7a 100644
--- a/WPrefs.app/po/ja.po
+++ b/WPrefs.app/po/ja.po
@@ -237,7 +237,7 @@ msgstr "アイコン %s がロードできません"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
+msgid "could not process icon %s: %s"
msgstr "アイコン %s を処理できません"
#: ../../WPrefs.app/Configurations.c:188 ../../WPrefs.app/Workspace.c:164
diff --git a/WPrefs.app/po/ko.po b/WPrefs.app/po/ko.po
index d1ea0c2..b5a5244 100644
--- a/WPrefs.app/po/ko.po
+++ b/WPrefs.app/po/ko.po
@@ -437,8 +437,8 @@ msgstr "아이콘 %s를 읽어들일 수 없음"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "아이콘 %s를 처리할 수 없음:"
+msgid "could not process icon %s: %s"
+msgstr "아이콘 %s를 처리할 수 없음: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/pt.po b/WPrefs.app/po/pt.po
index 2232c96..1593228 100644
--- a/WPrefs.app/po/pt.po
+++ b/WPrefs.app/po/pt.po
@@ -448,8 +448,8 @@ msgstr "ícone %s não pôde ser carregado"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "ícone %s não pôde ser processado:"
+msgid "could not process icon %s: %s"
+msgstr "ícone %s não pôde ser processado: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/ru.po b/WPrefs.app/po/ru.po
index cd2945c..1cf1fba 100644
--- a/WPrefs.app/po/ru.po
+++ b/WPrefs.app/po/ru.po
@@ -237,8 +237,8 @@ msgstr "не могу загрузить иконку %s"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "не могу обработать иконку %s:"
+msgid "could not process icon %s: %s"
+msgstr "не могу обработать иконку %s: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/sk.po b/WPrefs.app/po/sk.po
index 6b8d8a9..49a9e62 100644
--- a/WPrefs.app/po/sk.po
+++ b/WPrefs.app/po/sk.po
@@ -242,8 +242,8 @@ msgstr "nemožno načítať ikonu %s"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "nemožno spracovať ikonu %s"
+msgid "could not process icon %s: %s"
+msgstr "nemožno spracovať ikonu %s %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/WPrefs.app/po/zh_CN.po b/WPrefs.app/po/zh_CN.po
index 01104fa..08ba2a6 100644
--- a/WPrefs.app/po/zh_CN.po
+++ b/WPrefs.app/po/zh_CN.po
@@ -433,8 +433,8 @@ msgstr "不能载入图标 %s"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:87
#, c-format
-msgid "could not process icon %s:"
-msgstr "不能处理图标 %s:"
+msgid "could not process icon %s: %s"
+msgstr "不能处理图标 %s: %s"
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:126
#, c-format
diff --git a/WPrefs.app/po/zh_TW.po b/WPrefs.app/po/zh_TW.po
index 9e6e26c..e1b7fee 100644
--- a/WPrefs.app/po/zh_TW.po
+++ b/WPrefs.app/po/zh_TW.po
@@ -230,8 +230,8 @@ msgstr "無法載入圖示 %s"
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
#, c-format
-msgid "could not process icon %s:"
-msgstr "無法處理圖示 %s:"
+msgid "could not process icon %s: %s"
+msgstr "無法處理圖示 %s: %s"
#: ../../WPrefs.app/Configurations.c:188 ../../WPrefs.app/Workspace.c:164
#, c-format
diff --git a/po/be.po b/po/be.po
index 89e3542..eab3473 100644
--- a/po/be.po
+++ b/po/be.po
@@ -777,8 +777,8 @@ msgstr "не хапіла памяці падчас абноўлення пад
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "памылка загрузкі файла выявы \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "памылка загрузкі файла выявы \"%s\": %s"
#: ../src/icon.c:493 ../src/icon.c:502
#, c-format
diff --git a/po/bg.po b/po/bg.po
index 5e83ce4..43e47c4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -979,8 +979,8 @@ msgstr "изчерпана памет при актуализиране на GNO
# ../src/icon.c:229 ../src/wdefaults.c:435
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "грешка при зареждане на файла с картинка \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "грешка при зареждане на файла с картинка \"%s\": %s"
#
# ../src/icon.c:488 ../src/icon.c:497
diff --git a/po/bs.po b/po/bs.po
index ab4da5b..d8a386c 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -405,8 +405,8 @@ msgid "error rendering image:%s"
msgstr "greška pri predstavljanju slike: %s"
#: ../src/icon.c:182 ../src/wdefaults.c:402
-msgid "error loading image file \"%s\""
-msgstr "greška pri učitavanju image datoteke \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "greška pri učitavanju image datoteke \"%s\": %s"
#: ../src/icon.c:428 ../src/icon.c:437
msgid "could not create directory %s"
diff --git a/po/ca.po b/po/ca.po
index 2fd1380..33f646a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -804,8 +804,8 @@ msgstr "memòria esgotada quan s'actualitzaven les pistes de
GNOME"
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "error en carregar el fitxer d'imatge \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "error en carregar el fitxer d'imatge \"%s\": %s"
#: ../src/icon.c:493 ../src/icon.c:502
#, c-format
diff --git a/po/cs.po b/po/cs.po
index 3ed0825..824c632 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -783,8 +783,8 @@ msgstr "nedostatek paměti při obnovování pokynů pro GNOME"
#: ../src/icon.c:229 ../src/wdefaults.c:438
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "ze souboru \"%s\" nelze načíst obrázek"
+msgid "error loading image file \"%s\": %s"
+msgstr "ze souboru \"%s\" nelze načíst obrázek: %s"
#: ../src/icon.c:491 ../src/icon.c:500
#, c-format
diff --git a/po/da.po b/po/da.po
index e15a0d4..3f5fea7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -908,8 +908,8 @@ msgstr "løb tør for hukommelse da GNOME hints blev
opdateret"
# ../src/icon.c:229 ../src/wdefaults.c:430
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "fejl ved åbning af billedfil \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "fejl ved åbning af billedfil \"%s\": %s"
# ../src/icon.c:477 ../src/icon.c:486
#: ../src/icon.c:491 ../src/icon.c:500
diff --git a/po/de.po b/po/de.po
index 1b7f44c..f74aa1d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -775,8 +775,8 @@ msgstr "Fehler beim Anzeigen des Bildes: %s"
#: ../src/icon.c:219 ../src/wdefaults.c:423
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "Fehler beim Laden der Bilddatei \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "Fehler beim Laden der Bilddatei \"%s\": %s"
#: ../src/icon.c:458 ../src/icon.c:467
#, c-format
diff --git a/po/el.po b/po/el.po
index 73262d1..5b599a1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -586,8 +586,8 @@ msgstr ""
#: ../src/icon.c:229 ../src/wdefaults.c:427
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "σφάλμα στην φόρτωση της εικόνας στο αρχείο \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "σφάλμα στην φόρτωση της εικόνας στο αρχείο \"%s\": %s"
#: ../src/icon.c:477 ../src/icon.c:486
#, c-format
diff --git a/po/es.po b/po/es.po
index 44d0869..452a138 100644
--- a/po/es.po
+++ b/po/es.po
@@ -782,8 +782,8 @@ msgstr ""
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "error al cargar el fichero de imagen \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "error al cargar el fichero de imagen \"%s\": %s"
#: ../src/icon.c:493 ../src/icon.c:502
#, c-format
diff --git a/po/et.po b/po/et.po
index 9480e52..015c6e4 100644
--- a/po/et.po
+++ b/po/et.po
@@ -833,8 +833,8 @@ msgstr "viga pildi renderdamisel: %s"
#: ../src/icon.c:239 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "viga pildifaili \"%s\" laadimisel"
+msgid "error loading image file \"%s\": %s"
+msgstr "viga pildifaili \"%s\" laadimisel: %s"
#: ../src/icon.c:503 ../src/icon.c:512
#, c-format
diff --git a/po/fi.po b/po/fi.po
index 81f5157..a304856 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -759,8 +759,8 @@ msgstr "virhe piirrettäessä kuvaa: %s"
#: ../src/icon.c:229 ../src/wdefaults.c:440
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "virhe ladattaessa kuvaa \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "virhe ladattaessa kuvaa \"%s\": %s"
#: ../src/icon.c:491 ../src/icon.c:500
#, c-format
diff --git a/po/fr.po b/po/fr.po
index fa8e2c1..dfbbd3e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -791,8 +791,8 @@ msgstr ""
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "Erreur au chargement de l'image « %s »."
+msgid "error loading image file \"%s\": %s"
+msgstr "Erreur au chargement de l'image « %s ».: %s"
#: ../src/icon.c:493 ../src/icon.c:502
#, c-format
diff --git a/po/gl.po b/po/gl.po
index a8828d2..67cad7b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -627,8 +627,8 @@ msgstr "erro renderizando a imaxe: %s"
#: ../src/icon.c:229 ../src/wdefaults.c:435
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "erro cargando o ficheiro de imaxe \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "erro cargando o ficheiro de imaxe \"%s\": %s"
#: ../src/icon.c:488 ../src/icon.c:497
#, c-format
diff --git a/po/hr.po b/po/hr.po
index b298714..2372acf 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -404,8 +404,8 @@ msgid "error rendering image:%s"
msgstr "greška pri rednderiranju slike: %s"
#: ../src/icon.c:182 ../src/wdefaults.c:402
-msgid "error loading image file \"%s\""
-msgstr "greška pri učitavanju image datoteke \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "greška pri učitavanju image datoteke \"%s\": %s"
#: ../src/icon.c:428 ../src/icon.c:437
msgid "could not create directory %s"
diff --git a/po/hu.po b/po/hu.po
index 75d66a3..441f356 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -487,8 +487,8 @@ msgid "error rendering image: %s"
msgstr "hiba a %s kép leképezésekor"
#: ../src/icon.c:229 ../src/wdefaults.c:427
-msgid "error loading image file \"%s\""
-msgstr "hiba a \"%s\" kép betöltése közben"
+msgid "error loading image file \"%s\": %s"
+msgstr "hiba a \"%s\" kép betöltése közben: %s"
#: ../src/icon.c:477 ../src/icon.c:486
msgid "could not create directory %s"
diff --git a/po/hy.po b/po/hy.po
index 2038388..4800a04 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -901,7 +901,7 @@ msgstr ""
#: ../src/icon.c:239
#: ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
+msgid "error loading image file \"%s\": %s"
msgstr ""
#: ../src/icon.c:503
diff --git a/po/it.po b/po/it.po
index 2b25ce6..d8b553a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -825,8 +825,8 @@ msgstr "errore nella generazione dell'immagine: %s"
#: ../src/icon.c:239 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "errore nel caricamento del file \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "errore nel caricamento del file \"%s\": %s"
#: ../src/icon.c:503 ../src/icon.c:512
#, c-format
diff --git a/po/ja.po b/po/ja.po
index dce71ef..f14863c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -813,8 +813,8 @@ msgstr "画像のレンダリングエラー: %s"
#: ../src/icon.c:239 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "画像ファイル\"%s\"のロードエラー"
+msgid "error loading image file \"%s\": %s"
+msgstr "画像ファイル\"%s\"のロードエラー: %s"
#: ../src/icon.c:503 ../src/icon.c:512
#, c-format
diff --git a/po/ko.po b/po/ko.po
index 0f4de66..5214756 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -572,8 +572,8 @@ msgstr "이미지 렌더링 오류: %s"
#: ../src/icon.c:229 ../src/wdefaults.c:435
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "이미지 파일 \"%s\"를 읽는 중 오류"
+msgid "error loading image file \"%s\": %s"
+msgstr "이미지 파일 \"%s\"를 읽는 중 오류: %s"
#: ../src/icon.c:488 ../src/icon.c:497
#, c-format
diff --git a/po/ms.po b/po/ms.po
index 29fbf63..6a0bce5 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -758,8 +758,8 @@ msgstr "tak cukup memori bila mengemaskini petua GNOME"
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "ralat memuatkan fail imej \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "ralat memuatkan fail imej \"%s\": %s"
#: ../src/icon.c:491 ../src/icon.c:500
#, c-format
diff --git a/po/pl.po b/po/pl.po
index a97b0fd..adfd1cb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -441,8 +441,8 @@ msgstr "błąd podczas pokazywania obrazka:%s"
#: ../src/icon.c:182 ../src/wdefaults.c:411
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "błąd podczas ładowania pliku z obrazkiem \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "błąd podczas ładowania pliku z obrazkiem \"%s\": %s"
#: ../src/icon.c:430 ../src/icon.c:439
#, c-format
diff --git a/po/pt.po b/po/pt.po
index 07f0fd3..7be4458 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -620,8 +620,8 @@ msgstr "erro na apresentação de imagem:%s"
#: ../src/icon.c:229 ../src/wdefaults.c:435
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "erro ao carregar arquivo de imagens \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "erro ao carregar arquivo de imagens \"%s\": %s"
#: ../src/icon.c:488 ../src/icon.c:497
#, c-format
diff --git a/po/ru.po b/po/ru.po
index 84fc356..eee8383 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -797,8 +797,8 @@ msgstr "исчерпана память при обновлении \"намек
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "ошибка загрузки файла картинки \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "ошибка загрузки файла картинки \"%s\": %s"
#
#: ../src/icon.c:493 ../src/icon.c:502
diff --git a/po/sk.po b/po/sk.po
index f57065c..b86fc8b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -811,8 +811,8 @@ msgstr "nedostatok pamäti pri obnovovaní príznakov GNOME"
#: ../src/icon.c:229 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "chyba pri čítaní obrázku zo súboru \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "chyba pri čítaní obrázku zo súboru \"%s\": %s"
#: ../src/icon.c:493 ../src/icon.c:502
#, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 29e7317..9743664 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -574,8 +574,8 @@ msgstr "显示图像时出错: %s"
#: ../src/icon.c:229 ../src/wdefaults.c:427
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "载入图像文件\"%s\"时出错"
+msgid "error loading image file \"%s\": %s"
+msgstr "载入图像文件\"%s\"时出错: %s"
#: ../src/icon.c:477 ../src/icon.c:486
#, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d0eda67..4189359 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -805,8 +805,8 @@ msgstr "表現影像錯誤: %s"
#: ../src/icon.c:239 ../src/wdefaults.c:443
#, c-format
-msgid "error loading image file \"%s\""
-msgstr "載入影像檔錯誤 \"%s\""
+msgid "error loading image file \"%s\": %s"
+msgstr "載入影像檔錯誤 \"%s\": %s"
#: ../src/icon.c:503 ../src/icon.c:512
#, c-format
diff --git a/src/appmenu.c b/src/appmenu.c
index 0e182c6..5778cab 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -96,11 +96,11 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
char rtext[300];
if (strlen(slist[*index]) > 300) {
- wwarning("appmenu: menu command size exceeded in window %x",
win);
+ wwarning("appmenu: menu command size exceeded in window %lx",
win);
return NULL;
}
if (sscanf(slist[*index], "%i %i %n", &command, &code, &pos) < 2 ||
command != wmBeginMenu) {
- wwarning("appmenu: bad menu entry \"%s\" in window %x",
slist[*index], win);
+ wwarning("appmenu: bad menu entry \"%s\" in window %lx",
slist[*index], win);
return NULL;
}
strcpy(title, &slist[*index][pos]);
@@ -113,7 +113,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (sscanf(slist[*index], "%i", &command) != 1) {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry \"%s\" in window %x",
slist[*index], win);
+ wwarning("appmenu: bad menu entry \"%s\" in window
%lx", slist[*index], win);
return NULL;
}
@@ -129,7 +129,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (sscanf(slist[*index], "%i %i %i %i %n",
&command, &ecode, &etag, &enab,
&pos) != 4 || ecode != code) {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry
\"%s\" in window %x",
+ wwarning("appmenu: bad menu entry
\"%s\" in window %lx",
slist[*index], win);
return NULL;
}
@@ -139,14 +139,14 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (sscanf(slist[*index], "%i %i %i %i %s %n",
&command, &ecode, &etag, &enab,
rtext, &pos) != 5 || ecode != code) {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry
\"%s\" in window %x",
+ wwarning("appmenu: bad menu entry
\"%s\" in window %lx",
slist[*index], win);
return NULL;
}
strcpy(title, &slist[*index][pos]);
}
if (!(data = malloc(sizeof(WAppMenuData)))) {
- wwarning("appmenu: out of memory making menu
for window %x", win);
+ wwarning("appmenu: out of memory making menu
for window %lx", win);
wMenuDestroy(menu, True);
return NULL;
}
@@ -156,7 +156,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
entry = wMenuAddCallback(menu, title, notifyClient,
data);
if (!entry) {
wMenuDestroy(menu, True);
- wwarning("appmenu: out of memory creating menu
for window %x", slist[*index], win);
+ wwarning("appmenu: out of memory creating menu
for window %lx", win);
wfree(data);
return NULL;
}
@@ -175,7 +175,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (sscanf(slist[*index], "%i %i %i %i %i %n",
&command, &ecode, &etag, &enab, &ncode,
&pos) != 5 || ecode != code) {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry \"%s\" in
window %x", slist[*index], win);
+ wwarning("appmenu: bad menu entry \"%s\" in
window %lx", slist[*index], win);
return NULL;
}
@@ -189,7 +189,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (!entry) {
wMenuDestroy(menu, True);
wMenuDestroy(submenu, True);
- wwarning("appmenu: out of memory creating menu
for window %x", slist[*index], win);
+ wwarning("appmenu: out of memory creating menu
for window %lx", win);
return NULL;
}
@@ -197,7 +197,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
} else {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry \"%s\" in window %x",
slist[*index], win);
+ wwarning("appmenu: bad menu entry \"%s\" in window
%lx", slist[*index], win);
return NULL;
}
}
@@ -221,7 +221,7 @@ WMenu *wAppMenuGet(WScreen * scr, Window window)
}
XFree(text_prop.value);
if (strcmp(slist[0], "WMMenu 0") != 0) {
- wwarning("appmenu: unknown version of WMMenu in window %x: %s",
window, slist[0]);
+ wwarning("appmenu: unknown version of WMMenu in window %lx:
%s", window, slist[0]);
XFreeStringList(slist);
return NULL;
}
diff --git a/src/dock.c b/src/dock.c
index 00f1934..e4a6022 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -3514,7 +3514,7 @@ static Bool handleIconMove(WDock *dock, WAppIcon *aicon,
XEvent *event)
Bool hasMoved = False;
if (wPreferences.flags.noupdates)
- return;
+ return hasMoved;
if (XGrabPointer(dpy, icon->core->window, True, ButtonMotionMask
| ButtonReleaseMask | ButtonPressMask, GrabModeAsync,
diff --git a/src/event.c b/src/event.c
index 6f51a76..7b58f1d 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1159,16 +1159,14 @@ static void handleShapeNotify(XEvent * event)
{
XShapeEvent *shev = (XShapeEvent *) event;
WWindow *wwin;
- XEvent ev;
-
- while (XCheckTypedWindowEvent(dpy, shev->window, event->type, &ev)) {
- XShapeEvent *sev = (XShapeEvent *) & ev;
+ XShapeEvent ev;
- if (sev->kind == ShapeBounding) {
- if (sev->shaped == shev->shaped) {
- *shev = *sev;
+ while (XCheckTypedWindowEvent(dpy, shev->window, event->type, (XEvent
*)&ev)) {
+ if (ev.kind == ShapeBounding) {
+ if (ev.shaped == shev->shaped) {
+ *shev = ev;
} else {
- XPutBackEvent(dpy, &ev);
+ XPutBackEvent(dpy, (XEvent *)&ev);
break;
}
}
diff --git a/src/icon.c b/src/icon.c
index 40ad022..c781542 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -216,7 +216,7 @@ WIcon *wIconCreateWithIconFile(WScreen * scr, char
*iconfile, int tile)
if (iconfile) {
icon->image = RLoadImage(scr->rcontext, iconfile, 0);
if (!icon->image) {
- wwarning(_("error loading image file \"%s\""),
iconfile, RMessageForError(RErrorCode));
+ wwarning(_("error loading image file \"%s\": %s"),
iconfile, RMessageForError(RErrorCode));
}
icon->image = wIconValidateIconSize(scr, icon->image);
diff --git a/src/misc.c b/src/misc.c
index 7790edb..b881053 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -404,7 +404,7 @@ char *ShrinkString(WMFont * font, char *string, int width)
char *FindImage(char *paths, char *file)
{
- char *tmp, *path;
+ char *tmp, *path = NULL;
tmp = strrchr(file, ':');
if (tmp) {
diff --git a/src/motif.c b/src/motif.c
index 3e9e5e9..1b29f53 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -137,7 +137,7 @@ static void setupMWMHints(WWindow *wwin, MWMHints
*mwm_hints)
static int getMWMHints(Window window, MWMHints *mwmhints)
{
unsigned long *data;
- int count;
+ int count, ret = 0;
if (!_XA_MOTIF_WM_HINTS)
_XA_MOTIF_WM_HINTS = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
@@ -149,6 +149,7 @@ static int getMWMHints(Window window, MWMHints *mwmhints)
return 0;
if (count >= 4) {
+ ret = 1;
mwmhints->flags = data[0];
mwmhints->functions = data[1];
mwmhints->decorations = data[2];
@@ -158,7 +159,7 @@ static int getMWMHints(Window window, MWMHints *mwmhints)
}
XFree(data);
- return 1;
+ return ret;
}
void wMWMCheckClientHints(WWindow *wwin)
diff --git a/src/rootmenu.c b/src/rootmenu.c
index 29687a9..02388b2 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -1212,7 +1212,7 @@ static WMenu *readMenuPipe(WScreen * scr, char
**file_name)
separateline(line, title, command, params, shortcut);
if (!command[0]) {
- wwarning(_("%s:missing command in menu config: %s"),
file_name, line);
+ wwarning(_("%s:missing command in menu config: %s"),
filename, line);
break;
}
if (strcasecmp(command, "MENU") == 0) {
diff --git a/src/wdefaults.c b/src/wdefaults.c
index 5fec333..c7e7126 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -420,7 +420,7 @@ RImage *wDefaultGetImage(WScreen * scr, char *winstance,
char *wclass)
image = RLoadImage(scr->rcontext, path, 0);
if (!image) {
- wwarning(_("error loading image file \"%s\""), path,
RMessageForError(RErrorCode));
+ wwarning(_("error loading image file \"%s\": %s"), path,
RMessageForError(RErrorCode));
}
wfree(path);
diff --git a/util/fontconv.c b/util/fontconv.c
index e3263b4..f488506 100644
--- a/util/fontconv.c
+++ b/util/fontconv.c
@@ -111,7 +111,7 @@ static char *mapWeightToName(str * weight)
}
}
- snprintf(buf, sizeof(buf), ":%.*s", weight->len, weight->str);
+ snprintf(buf, sizeof(buf), ":%.*s", (int)weight->len, weight->str);
return buf;
}
@@ -154,7 +154,7 @@ char *xlfdToFc(char *xlfd, char *useFamily, Bool keepXLFD)
if (family->len == 0 || family->str[0] == '*')
return wstrdup(DEFAULT_FONT);
- snprintf(buf, sizeof(buf), "%.*s", family->len, family->str);
+ snprintf(buf, sizeof(buf), "%.*s", (int)family->len,
family->str);
name = wstrdup(buf);
}
diff --git a/util/getstyle.c b/util/getstyle.c
index 1023c10..577554b 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -181,7 +181,7 @@ static Bool isFontOption(char *option)
/* XXX: is almost like WINGs/wcolodpanel.c:fetchFile() */
void copyFile(char *dir, char *file)
{
- FILE *src, *dst;
+ FILE *src = NULL, *dst = NULL;
size_t nread, nwritten, len;
char buf[4096];
struct stat st;
@@ -230,7 +230,9 @@ void copyFile(char *dir, char *file)
RETRY( fclose(dst) )
err:
- RETRY( fclose(src) )
+ if (src) {
+ RETRY( fclose(src) )
+ }
wfree(dstpath);
return;
}
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index cf4516f..8f7638d 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -471,7 +471,7 @@ BackgroundTexture *parseTexture(RContext * rc, char *text)
XColor color;
Pixmap pixmap = None;
RImage *image = NULL;
- int iwidth, iheight;
+ int iwidth = 0, iheight = 0;
RColor rcolor;
GETSTRORGOTO(val, tmp, 1, error);
@@ -879,7 +879,7 @@ void helperLoop(RContext * rc)
memset(textures, 0, WORKSPACE_COUNT * sizeof(BackgroundTexture *));
while (1) {
- int workspace;
+ int workspace = -1;
/* get length of message */
if (readmsg(0, buffer, 4) < 0) {
