chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fixes for GCC 4.1
[disorder]
/
disobedience
/
properties.c
diff --git
a/disobedience/properties.c
b/disobedience/properties.c
index ade23fbfbfc0781e38befbb112e43973dc8e87ba..8b461090999fd26934bd456917f33933a269593f 100644
(file)
--- a/
disobedience/properties.c
+++ b/
disobedience/properties.c
@@
-344,9
+344,9
@@
static void set_namepart(struct prefdata *f, const char *value) {
}
/* Called when we've set a namepart */
}
/* Called when we've set a namepart */
-static void set_namepart_completed(void *v, const char *err
or
) {
- if(err
or
)
- popup_protocol_error(0, err
or
);
+static void set_namepart_completed(void *v, const char *err) {
+ if(err)
+ popup_protocol_error(0, err);
else {
struct prefdata *f = v;
else {
struct prefdata *f = v;
@@
-377,9
+377,9
@@
static void set_edited_string(struct prefdata *f, const char *value) {
}
static void set_string_completed(void attribute((unused)) *v,
}
static void set_string_completed(void attribute((unused)) *v,
- const char *err
or
) {
- if(err
or
)
- popup_protocol_error(0, err
or
);
+ const char *err) {
+ if(err)
+ popup_protocol_error(0, err);
}
static void set_string(struct prefdata *f, const char *value) {
}
static void set_string(struct prefdata *f, const char *value) {
@@
-441,8
+441,8
@@
static void prefdata_onerror(struct callbackdata *cbd,
}
/* Got the value of a pref */
}
/* Got the value of a pref */
-static void prefdata_completed(void *v, const char *err
or
, const char *value) {
- if(err
or
) {
+static void prefdata_completed(void *v, const char *err, const char *value) {
+ if(err) {
} else {
struct callbackdata *cbd = v;
} else {
struct callbackdata *cbd = v;