This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 877f8dfdb6684e0638b444d36419a7d2aa7ce8e0 (commit)
via e55cb1f66e1fb9cb65928402e1127922cf98ce4b (commit)
from b6d52269dcea3015c08595645cc1f95af8891006 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/877f8dfdb6684e0638b444d36419a7d2aa7ce8e0
commit 877f8dfdb6684e0638b444d36419a7d2aa7ce8e0
Author: David Maciejak <[email protected]>
Date: Fri Feb 28 11:21:47 2014 +0700
WPrefs: Fixed compiler warnings
This patch is used to catch some return function value, to make the
compiler happy.
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 3bd571a7..500cbddf 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -1261,17 +1261,24 @@ static Pixmap loadRImage(WMScreen * scr, const char
*path)
{
FILE *f;
RImage *image;
- int w, h, d;
+ int w, h, d, cnt;
Pixmap pixmap;
f = fopen(path, "rb");
if (!f)
return None;
- fscanf(f, "%02x%02x%1x", &w, &h, &d);
-
+ cnt = fscanf(f, "%02x%02x%1x", &w, &h, &d);
+ if (cnt != 3) {
+ fclose(f);
+ return None;
+ }
image = RCreateImage(w, h, d == 4);
- fread(image->data, 1, w * h * d, f);
+ cnt = w * h * d;
+ if (fread(image->data, 1, cnt, f) != cnt) {
+ fclose(f);
+ return None;
+ }
fclose(f);
RConvertImage(WMScreenRContext(scr), image, &pixmap);
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index 2aa500bf..f83ec3a1 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -714,8 +714,8 @@ static void storeCommandInScript(const char *cmd, const
char *line)
wfree(tmppath);
}
sprintf(buffer, "chmod u+x %s", path);
- system(buffer);
-
+ if (system(buffer) == -1)
+ werror(_("could not execute command"));
end:
wfree(path);
if (f) {
http://repo.or.cz/w/wmaker-crm.git/commit/e55cb1f66e1fb9cb65928402e1127922cf98ce4b
commit e55cb1f66e1fb9cb65928402e1127922cf98ce4b
Author: David Maciejak <[email protected]>
Date: Fri Feb 28 08:00:18 2014 +0700
Updated copyright date
diff --git a/src/dialog.c b/src/dialog.c
index 43f12fcb..69fd31d4 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1106,7 +1106,7 @@ typedef struct {
#define COPYRIGHT_TEXT "Copyright xc2xa9 1997-2006 Alfredo K. Kojiman"
"Copyright xc2xa9 1998-2006 Dan Pascun"- "Copyright xc2xa9 2013 Window
Maker Developers Team"
+ "Copyright xc2xa9 2013-2014 Window Maker Developers Team"
static InfoPanel *thePanel = NULL;
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/Appearance.c | 15 +++++++++++----
WPrefs.app/MouseSettings.c | 4 ++--
src/dialog.c | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
