Index: eve/src/bin/main.c =================================================================== --- eve/src/bin/main.c (revision 51690) +++ eve/src/bin/main.c (working copy) @@ -363,7 +363,7 @@ else url = DEFAULT_URL; - if (user_agent && strcasecmp(user_agent, "iphone") == 0) + if ((user_agent) && (strcasecmp(user_agent, "iphone") == 0)) user_agent = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3"; @@ -375,7 +375,7 @@ history_init(); home = getenv("HOME"); - if (!home || !home[0]) + if ((!home) || (!home[0])) { CRITICAL("Could not get $HOME"); r = -1; Index: eve/src/bin/view.c =================================================================== --- eve/src/bin/view.c (revision 51690) +++ eve/src/bin/view.c (working copy) @@ -386,7 +386,7 @@ vx = abs(dx) >> 4; vy = abs(dy) >> 4; - if (vx == 0 && vy == 0) + if ((vx == 0) && (vy == 0)) return; /* motion vector is not significant, don't pre-render */ else if (vx < vy) { @@ -538,11 +538,11 @@ y = 0; /* if there is anything to scroll, ask it */ - if (x != 0 || y != 0) + if ((x != 0) || (y != 0)) ewk_frame_scroll_add(sd->base.main_frame, x, y); /* if we finished our work, just stop the animator */ - if (dt >= 1.0 || (sd->kinetic.done.x && sd->kinetic.done.y)) + if ((dt >= 1.0) || ((sd->kinetic.done.x) && (sd->kinetic.done.y))) { _view_pan_pre_render(sd, sd->kinetic.start.dx, sd->kinetic.start.dy); sd->animator.kinetic = NULL; @@ -660,7 +660,7 @@ struct point_history *p = sd->pan.history + i; double dt = t - p->timestamp; - if (dt > 0.2 && samples > 0) + if ((dt > 0.2) && (samples > 0)) break; at += dt; @@ -1354,7 +1354,7 @@ evas_object_show(dialog_data->entry); } - if (type == DIALOG_PROMPT || type == DIALOG_CONFIRM) + if ((type == DIALOG_PROMPT) || (type == DIALOG_CONFIRM)) { Evas_Object *bx_h = elm_box_add(bx_v); elm_box_horizontal_set(bx_h, 1); @@ -1537,7 +1537,7 @@ float zoom = ewk_frame_zoom_get(sd->base.main_frame); unsigned int idx = _view_zoom_closest_index_find(zoom); Evas_Coord w, h; - if (sd->flags.animated_zoom || sd->animator.pan || sd->animator.zoom) + if ((sd->flags.animated_zoom) || (sd->animator.pan) || (sd->animator.zoom)) return; if (idx + 1 >= ZOOM_STEPS_LAST) @@ -1564,7 +1564,7 @@ float zoom = ewk_frame_zoom_get(sd->base.main_frame); unsigned int idx = _view_zoom_closest_index_find(zoom); Evas_Coord w, h; - if (sd->flags.animated_zoom || sd->animator.pan || sd->animator.zoom) + if ((sd->flags.animated_zoom) || (sd->animator.pan) || (sd->animator.zoom)) return; if (idx == 0) @@ -1588,7 +1588,7 @@ Eina_Bool view_context_menu_set(Evas_Object *view, Evas_Object *widget, Ewk_Context_Menu *menu) { VIEW_SD_GET_OR_RETURN(view, sd, EINA_FALSE); - if (widget && sd->context_menu) + if ((widget) && (sd->context_menu)) { CRITICAL("Trying to overwrite existing menu"); return EINA_FALSE; Index: eve/src/bin/chrome.c =================================================================== --- eve/src/bin/chrome.c (revision 51690) +++ eve/src/bin/chrome.c (working copy) @@ -288,7 +288,7 @@ { double item_time = hist_item_last_visit_get(item); double now = ctx->time; - return (now - item_time) > 24 * 3600 && (now - item_time) <= 48 * 3600; + return ((now - item_time) > 24 * 3600) && ((now - item_time) <= 48 * 3600); } static Bookmark_Menu_Item * @@ -472,7 +472,7 @@ Evas_Object *ed = elm_layout_edje_get(chrome); Fav_Item *item; - if (url && (item = fav_items_get(fav, url))) + if ((url) && (item = fav_items_get(fav, url))) { fav_item_visit_count_set(item, fav_item_visit_count_get(item) + 1); edje_object_signal_emit(ed, "favorite,hilight", ""); @@ -749,7 +749,7 @@ if (!eina_list_data_find(win->list_history, root)) { - if (root == bookmark_menu_root || !root) + if ((root == bookmark_menu_root) || (!root)) win->list_history = eina_list_prepend(win->list_history, NULL); else win->list_history = eina_list_prepend(win->list_history, root); @@ -757,7 +757,7 @@ elm_list_clear(list); - if (!root || root == bookmark_menu_root) + if ((!root) || (root == bookmark_menu_root)) { root = bookmark_menu_root; edje_object_part_text_set(ed, "bookmark-list-title", "Bookmarks"); @@ -798,7 +798,7 @@ edje_object_part_text_set(edje, "bookmark-list-title", edje_object_part_text_get(edje, "bookmark-list-back-button-text")); eina_stringshare_del(edje_object_part_text_get(edje, "bookmark-list-back-button-text")); - if ((bmi = win->list_history->data) && bmi->dynamic) + if ((bmi = win->list_history->data) && (bmi->dynamic)) { eina_stringshare_del(bmi->text); free(bmi); @@ -998,7 +998,7 @@ Browser_Window *win = evas_object_data_get(chrome, "win"); EINA_LIST_FREE(win->list_history, bmi) - if (bmi && bmi->dynamic) + if ((bmi) && (bmi->dynamic)) { eina_stringshare_del(bmi->text); free(bmi); Index: ethumb/src/plugins/emotion/emotion.c =================================================================== --- ethumb/src/plugins/emotion/emotion.c (revision 51690) +++ ethumb/src/plugins/emotion/emotion.c (working copy) @@ -89,7 +89,7 @@ if (_plugin->len > 0) _plugin->first = EINA_TRUE; - if (pos <=0 || pos >= 1) + if ((pos <=0) || (pos >= 1)) _plugin->pi = 0.1 * _plugin->len + _plugin->pcount * _plugin->len * interval; else Index: ethumb/src/lib/Ethumb.c =================================================================== --- ethumb/src/lib/Ethumb.c (revision 51690) +++ ethumb/src/lib/Ethumb.c (working copy) @@ -290,7 +290,7 @@ if (!frame) return; - if (frame->swallow && frame->edje) + if ((frame->swallow) && (frame->edje)) { o = edje_object_part_swallow_get(frame->edje, frame->swallow); if (o) @@ -329,8 +329,8 @@ ethumb_thumb_fdo_set(Ethumb *e, Ethumb_Thumb_FDO_Size s) { EINA_SAFETY_ON_NULL_RETURN(e); - EINA_SAFETY_ON_FALSE_RETURN(s == ETHUMB_THUMB_NORMAL || - s == ETHUMB_THUMB_LARGE); + EINA_SAFETY_ON_FALSE_RETURN((s == ETHUMB_THUMB_NORMAL) || + (s == ETHUMB_THUMB_LARGE)); DBG("ethumb=%p, size=%d", e, s); if (s == ETHUMB_THUMB_NORMAL) @@ -379,9 +379,9 @@ ethumb_thumb_format_set(Ethumb *e, Ethumb_Thumb_Format f) { EINA_SAFETY_ON_NULL_RETURN(e); - EINA_SAFETY_ON_FALSE_RETURN(f == ETHUMB_THUMB_FDO || - f == ETHUMB_THUMB_JPEG || - f == ETHUMB_THUMB_EET); + EINA_SAFETY_ON_FALSE_RETURN((f == ETHUMB_THUMB_FDO) || + (f == ETHUMB_THUMB_JPEG) || + (f == ETHUMB_THUMB_EET)); DBG("ethumb=%p, format=%d", e, f); e->format = f; @@ -398,9 +398,9 @@ ethumb_thumb_aspect_set(Ethumb *e, Ethumb_Thumb_Aspect a) { EINA_SAFETY_ON_NULL_RETURN(e); - EINA_SAFETY_ON_FALSE_RETURN(a == ETHUMB_THUMB_KEEP_ASPECT || - a == ETHUMB_THUMB_IGNORE_ASPECT || - a == ETHUMB_THUMB_CROP); + EINA_SAFETY_ON_FALSE_RETURN((a == ETHUMB_THUMB_KEEP_ASPECT) || + (a == ETHUMB_THUMB_IGNORE_ASPECT) || + (a == ETHUMB_THUMB_CROP)); DBG("ethumb=%p, aspect=%d", e, a); e->aspect = a; @@ -741,7 +741,7 @@ EINA_SAFETY_ON_NULL_RETURN_VAL(e, 0); DBG("ethumb=%p, path=%s, key=%s", e, path ? path : "", key ? key : ""); - if (path && access(path, R_OK)) + if ((path) && (access(path, R_OK))) { ERR("couldn't access file \"%s\"", path); return EINA_FALSE; @@ -835,8 +835,8 @@ static int _ethumb_file_check_fdo(Ethumb *e) { - if (!((e->tw == THUMB_SIZE_NORMAL && e->th == THUMB_SIZE_NORMAL) || - (e->tw == THUMB_SIZE_LARGE && e->th == THUMB_SIZE_LARGE))) + if (!(((e->tw == THUMB_SIZE_NORMAL) && (e->th == THUMB_SIZE_NORMAL)) || + ((e->tw == THUMB_SIZE_LARGE) && (e->th == THUMB_SIZE_LARGE)))) return 0; if (e->format != ETHUMB_THUMB_FDO) @@ -1005,7 +1005,7 @@ if (e->aspect == ETHUMB_THUMB_KEEP_ASPECT) { - if ((ia > a && e->tw > 0) || e->th <= 0) + if (((ia > a) && (e->tw > 0)) || (e->th <= 0)) *h = e->tw / ia; else *w = e->th * ia; @@ -1039,7 +1039,7 @@ if (e->aspect == ETHUMB_THUMB_CROP) { - if ((ia > a && e->tw > 0) || e->th <= 0) + if (((ia > a) && (e->tw > 0)) || (e->th <= 0)) *fw = e->th * ia; else *fh = e->tw / ia; @@ -1049,7 +1049,7 @@ } else if (e->aspect == ETHUMB_THUMB_KEEP_ASPECT) { - if ((ia > a && e->tw > 0) || e->th <= 0) + if (((ia > a) && (e->tw > 0)) || (e->th <= 0)) *fh = e->tw / ia; else *fw = e->th * ia; @@ -1326,9 +1326,9 @@ EINA_SAFETY_ON_TRUE_RETURN_VAL(r_src, 0); - if (r_thumb && errno != ENOENT) + if ((r_thumb) && (errno != ENOENT)) ERR("could not access file \"%s\": %s", e->thumb_path, strerror(errno)); - else if (!r_thumb && thumb.st_mtime > src.st_mtime) + else if ((!r_thumb) && (thumb.st_mtime > src.st_mtime)) r = EINA_TRUE; return r; Index: ethumb/src/lib/client/Ethumb_Client.c =================================================================== --- ethumb/src/lib/client/Ethumb_Client.c (revision 51690) +++ ethumb/src/lib/client/Ethumb_Client.c (working copy) @@ -252,17 +252,17 @@ return; } - if(!from || !name) + if((!from) || (!name)) return ; if (strcmp(name, _ethumb_dbus_bus_name) != 0) return; DBG("NameOwnerChanged from=[%s] to=[%s]", from, to); - if (from[0] != '\0' && to[0] == '\0') + if ((from[0] != '\0') && (to[0] == '\0')) { DBG("exit ethumbd at %s", from); - if (client->unique_name && strcmp(client->unique_name, from) != 0) + if ((client->unique_name) && (strcmp(client->unique_name, from) != 0)) WRN("%s was not the known name %s, ignored.", from, client->unique_name); else if(client->unique_name) @@ -432,7 +432,7 @@ client->pending_get_name_owner = NULL; - if (dbus_error_is_set(err) && (!client->server_started)) + if ((dbus_error_is_set(err)) && (!client->server_started)) { DBG("could not find server (%s), try to start it...", err->message); _ethumb_client_start_server(client); Index: ethumb/src/bin/ethumb.c =================================================================== --- ethumb/src/bin/ethumb.c (revision 51690) +++ ethumb/src/bin/ethumb.c (working copy) @@ -234,7 +234,7 @@ ethumb_thumb_aspect_set(e, aspect); if (directory) ethumb_thumb_dir_path_set(e, directory); if (category) ethumb_thumb_category_set(e, category); - if (geometry.w > 0 && geometry.h > 0) + if ((geometry.w > 0) && (geometry.h > 0)) ethumb_thumb_size_set(e, geometry.w, geometry.h); if (frame.file) { @@ -248,13 +248,13 @@ if (page > 0) ethumb_document_page_set(e, page); - if (r && arg_index < argc) + if ((r) && (arg_index < argc)) r = ethumb_file_set(e, argv[arg_index++], src_key); else r = 0; - if (r && arg_index < argc) + if ((r) && (arg_index < argc)) thumb_path = argv[arg_index++]; - if (r && arg_index < argc) + if ((r) && (arg_index < argc)) thumb_key = argv[arg_index]; if (r) @@ -270,7 +270,7 @@ r = ethumb_generate(e, _finished_thumb, NULL, NULL); } - if (r && !quit_option) + if ((r) && (!quit_option)) ecore_main_loop_begin(); ethumb_file_free(e); Index: ethumb/src/bin/ethumbd_client.c =================================================================== --- ethumb/src/bin/ethumbd_client.c (revision 51690) +++ ethumb/src/bin/ethumbd_client.c (working copy) @@ -179,7 +179,7 @@ if (opts->directory) ethumb_client_dir_path_set(c, opts->directory); if (opts->category) ethumb_client_category_set(c, opts->category); - if (opts->geometry.w > 0 && opts->geometry.h > 0) + if ((opts->geometry.w > 0) && (opts->geometry.h > 0)) ethumb_client_size_set(c, opts->geometry.w, opts->geometry.h); if (opts->frame.file) ethumb_client_frame_set Index: ethumb/src/bin/ethumbd.c =================================================================== --- ethumb/src/bin/ethumbd.c (revision 51690) +++ ethumb/src/bin/ethumbd.c (working copy) @@ -236,13 +236,13 @@ static int _ethumb_dbus_check_id(struct _Ethumb_Object *eobject, int id) { - if (id < 0 || id > MAX_ID) + if ((id < 0) || (id > MAX_ID)) return 0; if (eobject->min_id < eobject->max_id) - return id < eobject->min_id || id > eobject->max_id; + return (id < eobject->min_id) || (id > eobject->max_id); else if (eobject->min_id > eobject->max_id) - return id < eobject->min_id && id > eobject->max_id; + return (id < eobject->min_id) && (id > eobject->max_id); else return id != eobject->max_id; } @@ -250,7 +250,7 @@ static void _ethumb_dbus_inc_max_id(struct _Ethumb_Object *eobject, int id) { - if (eobject->min_id < 0 && eobject->max_id < 0) + if ((eobject->min_id < 0) && (eobject->max_id < 0)) eobject->min_id = id; eobject->max_id = id; @@ -820,7 +820,7 @@ q->count--; _ethumbd_child_write_op_del(ed, i); - if (!q->count && !ed->processing) + if ((!q->count) && (!ed->processing)) _ethumbd_timeout_start(ed); } @@ -858,13 +858,13 @@ DBG("NameOwnerChanged: name = %s, from = %s, to = %s", name, from, to); - if (from[0] == '\0' || to[0] != '\0') + if ((from[0] == '\0') || (to[0] != '\0')) return; from = eina_stringshare_add(from); for (i = 0; i < q->max_count; i++) { - if (q->table[i].used && q->table[i].client == from) + if ((q->table[i].used) && (q->table[i].client == from)) { _ethumb_table_del(ed, i); DBG("deleting [%d] from queue table.", i); @@ -1659,7 +1659,7 @@ _ethumb_dbus_interface_elements_add(E_DBus_Interface *iface, struct _Ethumb_DBus_Method_Table *mtable, struct _Ethumb_DBus_Signal_Table *stable) { int i = -1; - while (mtable && mtable[++i].name) + while ((mtable) && (mtable[++i].name)) if (!e_dbus_interface_method_add(iface, mtable[i].name, mtable[i].signature, @@ -1668,7 +1668,7 @@ return 0; i = -1; - while (stable && stable[++i].name) + while ((stable) && (stable[++i].name)) if (!e_dbus_interface_signal_add(iface, stable[i].name, stable[i].signature)) Index: ethumb/src/bin/ethumbd_child.c =================================================================== --- ethumb/src/bin/ethumbd_child.c (revision 51690) +++ ethumb/src/bin/ethumbd_child.c (working copy) @@ -75,7 +75,7 @@ return 0; else { - if (errno == EINTR || errno == EAGAIN) + if ((errno == EINTR) || (errno == EAGAIN)) continue; else { @@ -112,7 +112,7 @@ return 0; else { - if (errno == EINTR || errno == EAGAIN) + if ((errno == EINTR) || (errno == EAGAIN)) continue; else { Index: eeze/src/lib/eeze_udev_watch.c =================================================================== --- eeze/src/lib/eeze_udev_watch.c (revision 51690) +++ eeze/src/lib/eeze_udev_watch.c (working copy) @@ -129,7 +129,7 @@ if (test) cap = atoi(test); - if (!(test = (udev_device_get_property_value(device, "ID_FS_USAGE"))) || + if ((!(test = (udev_device_get_property_value(device, "ID_FS_USAGE")))) || (strcmp("filesystem", test)) || (cap == 52)) goto error; @@ -140,9 +140,9 @@ || (strcmp(test, "block"))) goto error; #endif - if (!(test = udev_device_get_property_value(device, "ID_BUS")) + if ((!(test = udev_device_get_property_value(device, "ID_BUS"))) || (strcmp("ata", test)) - || !(test = udev_device_get_sysattr_value(device, "removable")) + || (!(test = udev_device_get_sysattr_value(device, "removable"))) || (atoi(test))) goto error; @@ -153,9 +153,9 @@ || (strcmp(test, "block"))) goto error; #endif - if ((!(test = udev_device_get_sysattr_value(device, "removable")) + if (((!(test = udev_device_get_sysattr_value(device, "removable"))) || (!atoi(test))) - && (!(test = udev_device_get_sysattr_value(device, "capability")) + && ((!(test = udev_device_get_sysattr_value(device, "capability"))) || (atoi(test) != 10))) goto error; @@ -176,7 +176,7 @@ || (strcmp(test, "power_supply"))) goto error; #endif - if (!(test = udev_device_get_property_value(device, "POWER_SUPPLY_TYPE")) + if ((!(test = udev_device_get_property_value(device, "POWER_SUPPLY_TYPE"))) || (strcmp("Mains", test))) goto error; break; @@ -186,7 +186,7 @@ || (strcmp(test, "power_supply"))) goto error; #endif - if (!(test = udev_device_get_property_value(device, "POWER_SUPPLY_TYPE")) + if ((!(test = udev_device_get_property_value(device, "POWER_SUPPLY_TYPE"))) || (strcmp("Battery", test))) goto error; break; Index: eeze/src/lib/eeze_udev_private.c =================================================================== --- eeze/src/lib/eeze_udev_private.c (revision 51690) +++ eeze/src/lib/eeze_udev_private.c (working copy) @@ -104,12 +104,12 @@ if (!(model2 = udev_device_get_property_value(child, "ID_MODEL_ID"))) model2 = udev_device_get_property_value(child, "ID_MODEL"); - if ((!model2 && model) || (model2 && !model) || (!vendor2 && vendor) - || (vendor2 && !vendor)) + if (((!model2) && (model)) || ((model2) && (!model)) || ((!vendor2) && (vendor)) + || ((vendor2) && (!vendor))) break; else - if (((model && model2) && (strcmp(model, model2))) || - ((vendor && vendor2) && (strcmp(vendor, vendor2)))) + if (((model && (model2)) && (strcmp(model, model2))) || + ((vendor && (vendor2)) && (strcmp(vendor, vendor2)))) break; devname = udev_device_get_syspath(parent); Index: eeze/src/lib/eeze_udev_syspath.c =================================================================== --- eeze/src/lib/eeze_udev_syspath.c (revision 51690) +++ eeze/src/lib/eeze_udev_syspath.c (working copy) @@ -179,7 +179,7 @@ const char *value = NULL, *test; Eina_Strbuf *sbuf; - if (!syspath || !property) + if ((!syspath) || (!property)) return NULL; sbuf = eina_strbuf_new(); @@ -214,7 +214,7 @@ const char *value = NULL, *test; Eina_Strbuf *sbuf; - if (!syspath || !sysattr) + if ((!syspath) || (!sysattr)) return NULL; sbuf = eina_strbuf_new(); Index: eeze/src/bin/eeze_udev_test.c =================================================================== --- eeze/src/bin/eeze_udev_test.c (revision 51690) +++ eeze/src/bin/eeze_udev_test.c (working copy) @@ -34,7 +34,7 @@ if (strncmp(device + 5, name, strlen(device + 5) - 8)) goto end; /* check to see if the device was just plugged in */ - if (eeze_udev_syspath_is_kbd(device) || eeze_udev_syspath_is_mouse(device)) + if ((eeze_udev_syspath_is_kbd(device)) || (eeze_udev_syspath_is_mouse(device))) goto end; /* if we reach here, the device is neither a keyboard nor a mouse that we saw * previously, so we print a moderately amusing message and bail Index: E16/e/epp/cppexp.c =================================================================== --- E16/e/epp/cppexp.c (revision 51690) +++ E16/e/epp/cppexp.c (working copy) @@ -159,7 +159,7 @@ op->op = ERROR; return; } - if (len >= 3 && (!strncmp(p, "0x", 2) || !strncmp(p, "0X", 2))) + if ((len >= 3) && (!strncmp(p, "0x", 2) || !strncmp(p, "0X", 2))) { p += 2; base = 16; @@ -175,11 +175,11 @@ { c = *p++; - if (c >= '0' && c <= '9') + if ((c >= '0') && (c <= '9')) digit = c - '0'; - else if (base == 16 && c >= 'a' && c <= 'f') + else if ((base == 16) && (c >= 'a') && (c <= 'f')) digit = c - 'a' + 10; - else if (base == 16 && c >= 'A' && c <= 'F') + else if ((base == 16) && (c >= 'A') && (c <= 'F')) digit = c - 'A' + 10; else { @@ -228,7 +228,7 @@ cpp_warning(pfile, "integer constant out of range"); /* If too big to be signed, consider it unsigned. */ - if ((long)n < 0 && !op->unsignedp) + if (((long)n < 0) && (!op->unsignedp)) { if (base == 10) cpp_warning(pfile, @@ -364,8 +364,8 @@ if (c == '\\') { c = cpp_parse_escape(pfile, &ptr); - if (width < HOST_BITS_PER_INT - && (unsigned)c >= (unsigned)(1 << width)) + if ((width < HOST_BITS_PER_INT) + && ((unsigned)c >= (unsigned)(1 << width))) cpp_pedwarn(pfile, "escape sequence out of range for character"); } @@ -393,7 +393,7 @@ num_chars = max_chars; cpp_error(pfile, "character constant too long"); } - else if (num_chars != 1 && !CPP_TRADITIONAL(pfile)) + else if ((num_chars != 1) && (!CPP_TRADITIONAL(pfile))) cpp_warning(pfile, "multi-character character constant"); /* If char type is signed, sign-extend the constant. */ @@ -420,7 +420,7 @@ /* In all locales L'\0' is zero and mbtowc will return zero, * so don't use it. */ if (num_chars > 1 - || (num_chars == 1 && token_buffer[0] != '\0')) + || ((num_chars == 1) && (token_buffer[0] != '\0'))) { wchar_t wc; @@ -450,8 +450,8 @@ if (tok_start + 2 == tok_end) { for (toktab = tokentab2; toktab->oper; toktab++) - if (tok_start[0] == toktab->oper[0] - && tok_start[1] == toktab->oper[1]) + if ((tok_start[0] == toktab->oper[0]) + && (tok_start[1] == toktab->oper[1])) break; if (toktab->token == ERROR) { @@ -535,7 +535,7 @@ while (++count < 3) { c = *(*string_ptr)++; - if (c >= '0' && c <= '7') + if ((c >= '0') && (c <= '7')) i = (i << 3) + c - '0'; else { @@ -558,11 +558,11 @@ for (;;) { c = *(*string_ptr)++; - if (c >= '0' && c <= '9') + if ((c >= '0') && (c <= '9')) digit = c - '0'; - else if (c >= 'a' && c <= 'f') + else if ((c >= 'a') && (c <= 'f')) digit = c - 'a' + 10; - else if (c >= 'A' && c <= 'F') + else if ((c >= 'A') && (c <= 'F')) digit = c - 'A' + 10; else { @@ -600,7 +600,7 @@ { if (b >= HOST_BITS_PER_LONG) { - if (!unsignedp && a != 0) + if ((!unsignedp) && (a != 0)) integer_overflow(pfile); return 0; } @@ -801,13 +801,13 @@ top--; if ((top[1].flags & LEFT_OPERAND_REQUIRED) - && !(top[0].flags & HAVE_VALUE)) + && (!(top[0].flags & HAVE_VALUE))) { cpp_error(pfile, "syntax error - missing left operand"); goto syntax_error; } if ((top[1].flags & RIGHT_OPERAND_REQUIRED) - && !(top[1].flags & HAVE_VALUE)) + && (!(top[1].flags & HAVE_VALUE))) { cpp_error(pfile, "syntax error - missing right operand"); goto syntax_error; @@ -826,8 +826,8 @@ { top->value = v1 + v2; top->unsignedp = unsigned1 || unsigned2; - if (!top->unsignedp && !skip_evaluation - && !possible_sum_sign(v1, v2, top->value)) + if (!top->unsignedp && (!skip_evaluation) + && (!possible_sum_sign(v1, v2, top->value))) integer_overflow(pfile); } break; @@ -836,7 +836,7 @@ else if (!(top->flags & HAVE_VALUE)) { /* Unary '-' */ top->value = -v2; - if ((top->value & v2) < 0 && !unsigned2) + if ((top->value & v2) < 0 && (!unsigned2)) integer_overflow(pfile); top->unsignedp = unsigned2; top->flags |= HAVE_VALUE; @@ -846,7 +846,7 @@ top->value = v1 - v2; top->unsignedp = unsigned1 || unsigned2; if (!top->unsignedp - && !possible_sum_sign(top->value, v2, v1)) + && (!possible_sum_sign(top->value, v2, v1))) integer_overflow(pfile); } break; @@ -940,7 +940,7 @@ if (skip_evaluation) break; top->unsignedp = unsigned1; - if (v2 < 0 && !unsigned2) + if (v2 < 0 && (!unsigned2)) top->value = right_shift(pfile, v1, unsigned1, -v2); else top->value = left_shift(pfile, v1, unsigned1, v2); @@ -949,7 +949,7 @@ if (skip_evaluation) break; top->unsignedp = unsigned1; - if (v2 < 0 && !unsigned2) + if (v2 < 0 && (!unsigned2)) top->value = left_shift(pfile, v1, unsigned1, -v2); else top->value = right_shift(pfile, v1, unsigned1, v2); @@ -967,7 +967,7 @@ LOGICAL(|); break; case ANDAND: - top->value = v1 && v2; + top->value = v1 && (v2); top->unsignedp = 0; if (!v1) skip_evaluation--; @@ -1029,7 +1029,7 @@ break; default: fprintf(stderr, - top[1].op >= ' ' && top[1].op <= '~' + top[1].op >= ' ' && (top[1].op <= '~') ? "unimplemented operator '%c'\n" : "unimplemented operator '\\%03o'\n", top[1].op); } @@ -1065,9 +1065,9 @@ top->flags = flags; top->rprio = rprio; top->op = op.op; - if ((op.op == OROR && top[-1].value) - || (op.op == ANDAND && !top[-1].value) - || (op.op == '?' && !top[-1].value)) + if ((op.op == OROR && (top[-1].value)) + || (op.op == ANDAND && (!top[-1].value)) + || (op.op == '?' && (!top[-1].value))) { skip_evaluation++; } Index: E16/e/epp/cpphash.c =================================================================== --- E16/e/epp/cpphash.c (revision 51690) +++ E16/e/epp/cpphash.c (working copy) @@ -75,8 +75,8 @@ bucket = hashtab[hash]; while (bucket) { - if (bucket->length == len - && strncmp((const char *)bucket->name, name, len) == 0) + if ((bucket->length == len) + && (strncmp((const char *)bucket->name, name, len) == 0)) return bucket; bucket = bucket->next; } Index: E16/e/epp/cppmain.c =================================================================== --- E16/e/epp/cppmain.c (revision 51690) +++ E16/e/epp/cppmain.c (working copy) @@ -44,7 +44,7 @@ p = argv[0] + strlen(argv[0]); #ifndef __EMX__ - while (p != argv[0] && p[-1] != '/') + while ((p != argv[0]) && (p[-1] != '/')) #else while (p != argv[0] && p[-1] != '/' && p[-1] != '\\') #endif @@ -67,7 +67,7 @@ /* Now that we know the input file is valid, open the output. */ - if (!opts->out_fname || !strcmp(opts->out_fname, "")) + if ((!opts->out_fname) || (!strcmp(opts->out_fname, ""))) opts->out_fname = "stdout"; else if (!freopen(opts->out_fname, "w", stdout)) cpp_pfatal_with_name(&parse_in, opts->out_fname); Index: E16/e/epp/cpplib.c =================================================================== --- E16/e/epp/cpplib.c (revision 51690) +++ E16/e/epp/cpplib.c (working copy) @@ -216,11 +216,11 @@ * would cause it not to be recognized). */ #define NEWLINE_FIX \ - do {while (PEEKC() == '\\' && PEEKN(1) == '\n') FORWARD(2); } while(0) + do {while ((PEEKC() == '\\') && (PEEKN(1) == '\n')) FORWARD(2); } while(0) /* Same, but assume we've already read the potential '\\' into C. */ #define NEWLINE_FIX1(C) do { \ - while ((C) == '\\' && PEEKC() == '\n') { FORWARD(1); (C) = GETC(); }\ + while (((C) == '\\') && (PEEKC() == '\n')) { FORWARD(1); (C) = GETC(); }\ } while(0) /* Name under which this program was invoked. */ @@ -625,7 +625,7 @@ q = &buf[p - str]; while (*p) { - if (*p == '\\' && p[1] == '\n') + if ((*p == '\\') && (p[1] == '\n')) p += 2; else *q++ = *p++; @@ -664,9 +664,9 @@ } while (is_idchar[*++p]) ; - while (*p == ' ' || *p == '\t') + while ((*p == ' ') || (*p == '\t')) p++; - if (!(*p == 0 || *p == '(')) + if (!((*p == 0) || (*p == '('))) { cpp_error(pfile, "malformed option `%s %s'", option, str); return; @@ -687,7 +687,7 @@ struct cpp_options *opts = CPP_OPTIONS(pfile); file_name_list *dir; - if (!first || !last) + if ((!first) || (!last)) return; if (!opts->include) @@ -728,9 +728,9 @@ #ifndef MAX_OUTPUT_COLUMNS #define MAX_OUTPUT_COLUMNS 72 #endif - if (spacer - && pfile->deps_column > 0 - && (pfile->deps_column + size) > MAX_OUTPUT_COLUMNS) + if ((spacer) + && (pfile->deps_column > 0) + && ((pfile->deps_column + size) > MAX_OUTPUT_COLUMNS)) { deps_output(pfile, " \\\n ", 0); pfile->deps_column = 0; @@ -741,7 +741,7 @@ pfile->deps_buffer = (char *)xrealloc(pfile->deps_buffer, pfile->deps_allocated_size); } - if (spacer == ' ' && pfile->deps_column > 0) + if ((spacer == ' ') && (pfile->deps_column > 0)) pfile->deps_buffer[pfile->deps_size++] = ' '; memcpy(&pfile->deps_buffer[pfile->deps_size], string, size); pfile->deps_size += size; @@ -769,7 +769,7 @@ file_name_list *dirtmp; /* Find the end of this name. */ - while (*q != 0 && *q != PATH_SEPARATOR) + while ((*q != 0) && (*q != PATH_SEPARATOR)) q++; if (p == q) { @@ -860,7 +860,7 @@ pfile = NULL; if (macro->type == T_DISABLED) macro->type = T_MACRO; - if (macro->type != T_MACRO || pbuf->buf != macro->value.defn->expansion) + if ((macro->type != T_MACRO) || (pbuf->buf != macro->value.defn->expansion)) free(pbuf->buf); return 0; } @@ -888,7 +888,7 @@ { int c = 0; - while (PEEKC() == '\\' && PEEKN(1) == '\n') + while ((PEEKC() == '\\') && (PEEKN(1) == '\n')) { if (linep) (*linep)++; @@ -904,19 +904,19 @@ c = GETC(); if (c == EOF) return EOF; - while (c == '\\' && PEEKC() == '\n') + while ((c == '\\') && (PEEKC() == '\n')) { if (linep) (*linep)++; FORWARD(1), c = GETC(); } - if (prev_c == '*' && c == '/') + if ((prev_c == '*') && (c == '/')) return ' '; - if (c == '\n' && linep) + if ((c == '\n') && (linep)) (*linep)++; } } - else if (PEEKC() == '/' && CPP_OPTIONS(pfile)->cplusplus_comments) + else if ((PEEKC() == '/') && (CPP_OPTIONS(pfile)->cplusplus_comments)) { FORWARD(1); for (;;) @@ -924,7 +924,7 @@ c = GETC(); if (c == EOF) return ' '; /* Allow // to be terminated by EOF. */ - while (c == '\\' && PEEKC() == '\n') + while ((c == '\\') && (PEEKC() == '\n')) { FORWARD(1); c = GETC(); @@ -955,7 +955,7 @@ return; /* FIXME */ if (is_hor_space[c]) { - if ((c == '\f' || c == '\v') && CPP_PEDANTIC(pfile)) + if (((c == '\f') || (c == '\v')) && (CPP_PEDANTIC(pfile))) cpp_pedwarn(pfile, "%s in preprocessing directive", c == '\f' ? "formfeed" : "vertical tab"); FORWARD(1); @@ -966,15 +966,15 @@ c = skip_comment(pfile, NULL); if (c == '/') FORWARD(-1); - if (c == EOF || c == '/') + if ((c == EOF) || (c == '/')) return; } - else if (c == '\\' && PEEKN(1) == '\n') + else if ((c == '\\') && (PEEKN(1) == '\n')) { FORWARD(2); } - else if (c == '@' && CPP_BUFFER(pfile)->has_escapes - && is_hor_space[PEEKN(1)]) + else if ((c == '@') && (CPP_BUFFER(pfile)->has_escapes) + && (is_hor_space[PEEKN(1)])) FORWARD(2); else return; @@ -1010,7 +1010,7 @@ break; case '/': nextc = PEEKC(); - if (nextc == '*' || (opts->cplusplus_comments && nextc == '*')) + if ((nextc == '*') || ((opts->cplusplus_comments) && (nextc == '*'))) goto scan_directive_token; break; case '\f': @@ -1059,7 +1059,7 @@ cpp_skip_hspace(pfile); c = PEEKC(); - if (c >= '0' && c <= '9') + if ((c >= '0') && (c <= '9')) { /* Handle # followed by a line number. */ if (CPP_PEDANTIC(pfile)) @@ -1072,7 +1072,7 @@ parse_name(pfile, GETC()); ident = pfile->token_buffer + old_written + 1; ident_length = CPP_PWRITTEN(pfile) - ident; - if (ident_length == 0 && PEEKC() == '\n') + if ((ident_length == 0) && (PEEKC() == '\n')) { /* A line of just `#' becomes blank. */ goto done_a_directive; @@ -1085,8 +1085,8 @@ { if (kt->length <= 0) goto not_a_directive; - if (kt->length == ident_length - && !strncmp(kt->name, (const char *)ident, ident_length)) + if ((kt->length == ident_length) + && (!strncmp(kt->name, (const char *)ident, ident_length))) break; } @@ -1094,8 +1094,8 @@ { /* Nonzero means do not delete comments within the directive. * #define needs this when -traditional. */ - int comments = CPP_TRADITIONAL(pfile) - && kt->traditional_comments; + int comments = (CPP_TRADITIONAL(pfile)) + && (kt->traditional_comments); int save_put_out_comments = CPP_OPTIONS(pfile)->put_out_comments; @@ -1114,18 +1114,18 @@ * to the token_buffer. */ line_end = CPP_PWRITTEN(pfile); - if (!kt->pass_thru && kt->type != T_DEFINE) + if ((!kt->pass_thru) && (kt->type != T_DEFINE)) CPP_SET_WRITTEN(pfile, old_written); (*kt->func) (pfile, kt, pfile->token_buffer + after_ident, line_end); - if (kt->pass_thru - || (kt->type == T_DEFINE - && CPP_OPTIONS(pfile)->dump_macros == dump_definitions)) + if ((kt->pass_thru) + || ((kt->type == T_DEFINE) + && (CPP_OPTIONS(pfile)->dump_macros == dump_definitions))) { /* Just leave the entire #define in the output stack. */ } - else if (kt->type == T_DEFINE - && CPP_OPTIONS(pfile)->dump_macros == dump_names) + else if ((kt->type == T_DEFINE) + && (CPP_OPTIONS(pfile)->dump_macros == dump_names)) { unsigned char *p = pfile->token_buffer + old_written + 7; /* Skip "#define". */ @@ -1158,7 +1158,7 @@ CPP_RESERVE(pfile, 1 + keyword_length + (limit - buf)); CPP_PUTC_Q(pfile, '#'); CPP_PUTS_Q(pfile, keyword->name, keyword_length); - if (limit != buf && buf[0] != ' ') + if ((limit != buf) && (buf[0] != ' ')) CPP_PUTC_Q(pfile, ' '); CPP_PUTS_Q(pfile, buf, limit - buf); } @@ -1220,7 +1220,7 @@ /* Find the beginning of the trailing whitespace. */ p = buf; - while (p < limit && is_space[limit[-1]]) + while ((p < limit) && (is_space[limit[-1]])) limit--; /* Allocate space for the text in the macro definition. @@ -1246,7 +1246,7 @@ *exp_p++ = '@'; *exp_p++ = ' '; - if (limit - p >= 2 && p[0] == '#' && p[1] == '#') + if ((limit - p >= 2) && (p[0] == '#') && (p[1] == '#')) { cpp_error(pfile, "`##' at start of macro definition"); p += 2; @@ -1275,7 +1275,7 @@ break; case '\\': - if (p < limit && expected_delimiter) + if ((p < limit) && (expected_delimiter)) { /* In a string, backslash goes through * and makes next char ordinary. */ @@ -1294,12 +1294,12 @@ /* # is ordinary inside a string. */ if (expected_delimiter) break; - if (p < limit && *p == '#') + if ((p < limit) && (*p == '#')) { /* ##: concatenate preceding and following tokens. */ /* Take out the first #, discard preceding whitespace. */ exp_p--; - while (exp_p > lastp && is_hor_space[exp_p[-1]]) + while ((exp_p > lastp) && (is_hor_space[exp_p[-1]])) --exp_p; /* Skip the second #. */ p++; @@ -1315,7 +1315,7 @@ * Don't leave the # in the expansion. */ exp_p--; SKIP_WHITE_SPACE(p); - if (p == limit || !is_idstart[*p]) + if ((p == limit) || (!is_idstart[*p])) cpp_error(pfile, "`#' operator is not followed by a macro argument name"); else @@ -1345,8 +1345,8 @@ case '\\': /* Backslash quotes delimiters and itself, but not macro args. */ - if (expected_delimiter != 0 && p < limit - && (*p == expected_delimiter || *p == '\\')) + if ((expected_delimiter != 0) && (p < limit) + && ((*p == expected_delimiter) || (*p == '\\'))) { *exp_p++ = *p++; continue; @@ -1363,7 +1363,7 @@ * nothing at all. */ exp_p--; p += 1; - while (p < limit && !(p[-2] == '*' && p[-1] == '/')) + while ((p < limit) && (!((p[-2] == '*') && (p[-1] == '/')))) p++; } break; @@ -1371,13 +1371,13 @@ } /* Handle the start of a symbol. */ - if (is_idchar[c] && nargs > 0) + if ((is_idchar[c]) && (nargs > 0)) { unsigned char *id_beg = p - 1; int id_len; --exp_p; - while (p != limit && is_idchar[*p]) + while ((p != limit) && (is_idchar[*p])) p++; id_len = p - id_beg; @@ -1389,13 +1389,13 @@ { reflist *tpat; - if (arg->name[0] == c - && arg->length == id_len - && strncmp((const char *)arg->name, - (const char *)id_beg, id_len) == 0) + if ((arg->name[0] == c) + && (arg->length == id_len) + && (strncmp((const char *)arg->name, + (const char *)id_beg, id_len) == 0)) { - if (expected_delimiter - && CPP_OPTIONS(pfile)->warn_stringify) + if ((expected_delimiter) + && (CPP_OPTIONS(pfile)->warn_stringify)) { if (CPP_TRADITIONAL(pfile)) { @@ -1411,7 +1411,7 @@ } } /* If ANSI, don't actually substitute inside a string. */ - if (!CPP_TRADITIONAL(pfile) && expected_delimiter) + if ((!CPP_TRADITIONAL(pfile)) && (expected_delimiter)) break; /* make a pat node for this arg and append it to the end of * the pat list */ @@ -1437,8 +1437,8 @@ unsigned char *p1 = p; SKIP_WHITE_SPACE(p1); - if (p1 + 2 <= limit && p1[0] == '#' - && p1[1] == '#') + if ((p1 + 2 <= limit) && (p1[0] == '#') + && (p1[1] == '#')) tpat->raw_after = 1; } lastp = exp_p; /* place to start copying from next time */ @@ -1462,7 +1462,7 @@ } } - if (!CPP_TRADITIONAL(pfile) && expected_delimiter == 0) + if ((!CPP_TRADITIONAL(pfile)) && (expected_delimiter == 0)) { /* If ANSI, put in a "@ " marker to prevent token pasting. * But not if "inside a string" (which in ANSI mode @@ -1563,9 +1563,9 @@ { bp++; /* do we have a "special" rest-args extension here? */ - if ((unsigned)(limit - bp) > REST_EXTENSION_LENGTH && - strncmp(rest_extension, (const char *)bp, - REST_EXTENSION_LENGTH) == 0) + if (((unsigned)(limit - bp) > REST_EXTENSION_LENGTH) && + (strncmp(rest_extension, (const char *)bp, + REST_EXTENSION_LENGTH) == 0)) { rest_args = 1; temp->rest_args = 1; @@ -1577,7 +1577,7 @@ bp += REST_EXTENSION_LENGTH; arglengths += temp->length + 2; SKIP_WHITE_SPACE(bp); - if (temp->length == 0 || (*bp != ',' && *bp != ')')) + if ((temp->length == 0) || ((*bp != ',') && (*bp != ')'))) { cpp_error(pfile, "badly punctuated parameter list in `#define'"); @@ -1597,9 +1597,9 @@ struct arglist *otemp; for (otemp = temp->next; otemp; otemp = otemp->next) - if (temp->length == otemp->length && - strncmp((const char *)temp->name, - (const char *)otemp->name, temp->length) == 0) + if ((temp->length == otemp->length) && + (strncmp((const char *)temp->name, + (const char *)otemp->name, temp->length) == 0)) { char *name; @@ -1743,7 +1743,7 @@ } else { - if (!strncmp((const char *)symname, "defined", 7) && sym_length == 7) + if ((!strncmp((const char *)symname, "defined", 7)) && (sym_length == 7)) cpp_error(pfile, "invalid %s name `defined'", usage); } return sym_length; @@ -1764,16 +1764,16 @@ return 1; if (strcmp((char *)d1->args.argnames, (char *)d2->args.argnames)) return 1; - for (a1 = d1->pattern, a2 = d2->pattern; a1 && a2; + for (a1 = d1->pattern, a2 = d2->pattern; (a1) && (a2); a1 = a1->next, a2 = a2->next) { if (! - ((a1->nchars == a2->nchars - && !strncmp((const char *)p1, (const char *)p2, a1->nchars)) - || !comp_def_part(first, p1, a1->nchars, p2, a2->nchars, 0)) - || a1->argno != a2->argno || a1->stringify != a2->stringify - || a1->raw_before != a2->raw_before - || a1->raw_after != a2->raw_after) + (((a1->nchars == a2->nchars) + && (!strncmp((const char *)p1, (const char *)p2, a1->nchars))) + || (!comp_def_part(first, p1, a1->nchars, p2, a2->nchars, 0))) + || (a1->argno != a2->argno) || (a1->stringify != a2->stringify) + || (a1->raw_before != a2->raw_before) + || (a1->raw_after != a2->raw_after)) return 1; first = 0; p1 += a1->nchars; @@ -1805,25 +1805,25 @@ if (first) { - while (beg1 != end1 && is_space[*beg1]) + while ((beg1 != end1) && (is_space[*beg1])) beg1++; - while (beg2 != end2 && is_space[*beg2]) + while ((beg2 != end2) && (is_space[*beg2])) beg2++; } if (last) { - while (beg1 != end1 && is_space[end1[-1]]) + while ((beg1 != end1) && (is_space[end1[-1]])) end1--; - while (beg2 != end2 && is_space[end2[-1]]) + while ((beg2 != end2) && (is_space[end2[-1]])) end2--; } - while (beg1 != end1 && beg2 != end2) + while ((beg1 != end1) && (beg2 != end2)) { - if (is_space[*beg1] && is_space[*beg2]) + if ((is_space[*beg1]) && (is_space[*beg2])) { - while (beg1 != end1 && is_space[*beg1]) + while ((beg1 != end1) && (is_space[*beg1])) beg1++; - while (beg2 != end2 && is_space[*beg2]) + while ((beg2 != end2) && (is_space[*beg2])) beg2++; } else if (*beg1 == *beg2) @@ -1877,7 +1877,7 @@ /* If we are passing through #define and #undef directives, do * that for this re-definition now. */ - if (CPP_OPTIONS(pfile)->debug_output && keyword) + if ((CPP_OPTIONS(pfile)->debug_output) && (keyword)) pass_thru_directive((char *)buf, (char *)limit, pfile, keyword); msg = (char *)alloca(mdef.symlen + 22); @@ -1899,7 +1899,7 @@ { /* If we are passing through #define and #undef directives, do * that for this new definition now. */ - if (CPP_OPTIONS(pfile)->debug_output && keyword) + if ((CPP_OPTIONS(pfile)->debug_output) && (keyword)) pass_thru_directive((char *)buf, (char *)limit, pfile, keyword); install(mdef.symnam, mdef.symlen, T_MACRO, 0, (char *)mdef.defn, hashcode); @@ -1989,7 +1989,7 @@ if (token == CPP_EOF) /* Should not happen ... */ break; - if (token == CPP_POP && CPP_BUFFER(pfile) == buffer) + if ((token == CPP_POP) && (CPP_BUFFER(pfile) == buffer)) { cpp_pop_buffer(pfile); break; @@ -2133,8 +2133,8 @@ long line, col; cpp_buffer *ip = CPP_BUFFER(pfile); - if (CPP_OPTIONS(pfile)->no_line_commands - || !ip->fname || CPP_OPTIONS(pfile)->no_output) + if ((CPP_OPTIONS(pfile)->no_line_commands) + || (!ip->fname) || (CPP_OPTIONS(pfile)->no_output)) { return; } @@ -2150,7 +2150,7 @@ /* If the inherited line number is a little too small, * output some newlines instead of a #line command. */ - if (line > pfile->lineno && line < pfile->lineno + 8) + if ((line > pfile->lineno) && (line < pfile->lineno + 8)) { CPP_RESERVE(pfile, 20); while (line > pfile->lineno) @@ -2191,7 +2191,7 @@ } #ifndef NO_IMPLICIT_EXTERN_C /* Tell cc1plus if following text should be treated as C. */ - if (ip->system_header_p == 2 && CPP_OPTIONS(pfile)->cplusplus) + if ((ip->system_header_p == 2) && (CPP_OPTIONS(pfile)->cplusplus)) { CPP_PUTC_Q(pfile, ' '); CPP_PUTC_Q(pfile, '4'); @@ -2245,7 +2245,7 @@ case CPP_COMMA: /* if we've returned to lowest level and * we aren't absorbing all args */ - if (paren == 0 && rest_args == 0) + if ((paren == 0) && (rest_args == 0)) goto found; break; found: @@ -2296,7 +2296,7 @@ *obp++ = c = *ibp++; if (c == quotec) break; - if (c == '\n' && quotec == '\'') + if ((c == '\n') && (quotec == '\'')) break; } } @@ -2596,7 +2596,7 @@ { case '+': case '-': - if (c2 == c1 || c2 == '=') + if ((c2 == c1) || (c2 == '=')) return 1; goto letter; case '.': @@ -2612,11 +2612,11 @@ case '9': case 'e': case 'E': - if (c2 == '-' || c2 == '+') + if ((c2 == '-') || (c2 == '+')) return 1; /* could extend a pre-processing number */ goto letter; case 'L': - if (c2 == '\'' || c2 == '\"') + if ((c2 == '\'') || (c2 == '\"')) return 1; /* Could turn into L"xxx" or L'xxx'. */ goto letter; letter: @@ -2671,7 +2671,7 @@ case 'Y': case 'Z': /* We're in the middle of either a name or a pre-processing number. */ - return (is_idchar[c2] || c2 == '.'); + return ((is_idchar[c2]) || (c2 == '.')); case '<': case '>': case '!': @@ -2684,7 +2684,7 @@ case '*': case '/': case '=': - return (c2 == c1 || c2 == '='); + return ((c2 == c1) || (c2 == '=')); } return 0; } @@ -2746,10 +2746,10 @@ { if (rest_args) continue; - if (i < nargs || (nargs == 0 && i == 0)) + if ((i < nargs) || ((nargs == 0) && (i == 0))) { /* if we are working on last arg which absorbs rest of args... */ - if (i == nargs - 1 && defn->rest_args) + if ((i == nargs - 1) && (defn->rest_args)) rest_args = 1; args[i].raw = CPP_WRITTEN(pfile); token = macarg(pfile, rest_args); @@ -2758,7 +2758,7 @@ } else token = macarg(pfile, 0); - if (token == CPP_EOF || token == CPP_POP) + if ((token == CPP_EOF) || (token == CPP_POP)) { cpp_error_with_line(pfile, start_line, start_column, "unterminated macro call"); @@ -2777,23 +2777,23 @@ /* cpp.texi says for foo ( ) we provide one argument. * However, if foo wants just 0 arguments, treat this as 0. */ if (nargs == 0) - while (bp != lim && is_space[*bp]) + while ((bp != lim) && (is_space[*bp])) bp++; if (bp == lim) i = 0; } /* Don't output an error message if we have already output one for * a parse error above. */ - if (nargs == 0 && i > 0) + if ((nargs == 0) && (i > 0)) { cpp_error(pfile, "arguments given to macro `%s'", hp->name); } else if (i < nargs) { /* traditional C allows foo() if foo wants one argument. */ - if (nargs == 1 && i == 0 && CPP_TRADITIONAL(pfile)); + if ((nargs == 1) && (i == 0) && (CPP_TRADITIONAL(pfile))); /* the rest args token is allowed to absorb 0 tokens */ - else if (i == nargs - 1 && defn->rest_args) + else if ((i == nargs - 1) && (defn->rest_args)) rest_zero = 1; else if (i == 0) cpp_error(pfile, "macro `%s' used without args", hp->name); @@ -2862,8 +2862,8 @@ * one space except within an string or char token. */ if (is_space[c]) { - if (CPP_WRITTEN(pfile) > arg->stringified - && (CPP_PWRITTEN(pfile))[-1] == '@') + if ((CPP_WRITTEN(pfile) > arg->stringified) + && ((CPP_PWRITTEN(pfile))[-1] == '@')) { /* "@ " escape markers are removed */ CPP_ADJUST_WRITTEN(pfile, -1); @@ -2888,12 +2888,12 @@ if (c == in_string) in_string = 0; } - else if (c == '\"' || c == '\'') + else if ((c == '\"') || (c == '\'')) in_string = c; } /* Escape these chars */ - if (c == '\"' || (in_string && c == '\\')) + if ((c == '\"') || ((in_string) && (c == '\\'))) CPP_PUTC(pfile, '\\'); if (isprint(c)) CPP_PUTC(pfile, c); @@ -2912,7 +2912,7 @@ } xbuf_len += args[ap->argno].stringified_length; } - else if (ap->raw_before || ap->raw_after || CPP_TRADITIONAL(pfile)) + else if ((ap->raw_before) || (ap->raw_after) || (CPP_TRADITIONAL(pfile))) /* Add 4 for two newline-space markers to prevent * token concatenation. */ xbuf_len += args[ap->argno].raw_length + 4; @@ -2958,16 +2958,16 @@ /* If followed by an empty rest arg with concatenation, * delete the last run of nonwhite chars. */ - if (rest_zero && totlen > count_before - && ((ap->rest_args && ap->raw_before) - || (last_ap && last_ap->rest_args && last_ap->raw_after))) + if ((rest_zero) && (totlen > count_before) + && (((ap->rest_args) && (ap->raw_before)) + || ((last_ap) && (last_ap->rest_args) && (last_ap->raw_after)))) { /* Delete final whitespace. */ - while (totlen > count_before && is_space[xbuf[totlen - 1]]) + while ((totlen > count_before) && (is_space[xbuf[totlen - 1]])) totlen--; /* Delete the nonwhites before them. */ - while (totlen > count_before && !is_space[xbuf[totlen - 1]]) + while ((totlen > count_before) && (!is_space[xbuf[totlen - 1]])) totlen--; } if (ap->stringify != 0) @@ -2976,16 +2976,16 @@ arg->stringified_length); totlen += arg->stringified_length; } - else if (ap->raw_before || ap->raw_after || CPP_TRADITIONAL(pfile)) + else if ((ap->raw_before) || (ap->raw_after) || (CPP_TRADITIONAL(pfile))) { unsigned char *p1 = ARG_BASE + arg->raw; unsigned char *l1 = p1 + arg->raw_length; if (ap->raw_before) { - while (p1 != l1 && is_space[*p1]) + while ((p1 != l1) && (is_space[*p1])) p1++; - while (p1 != l1 && is_idchar[*p1]) + while ((p1 != l1) && (is_idchar[*p1])) xbuf[totlen++] = *p1++; } if (ap->raw_after) @@ -3002,7 +3002,7 @@ /* If a `-' is preceded by an odd number of newlines then it * and the last newline are a no-reexpansion marker. */ - while (p2 != p1 && p2[-1] == '\n') + while ((p2 != p1) && (p2[-1] == '\n')) p2--; if ((l1 - 1 - p2) & 1) { @@ -3022,9 +3022,9 @@ { unsigned char *expanded = ARG_BASE + arg->expanded; - if (!ap->raw_before && totlen > 0 && arg->expand_length - && !CPP_TRADITIONAL(pfile) - && unsafe_chars(xbuf[totlen - 1], expanded[0])) + if ((!ap->raw_before) && (totlen > 0) && (arg->expand_length) + && (!CPP_TRADITIONAL(pfile)) + && (unsafe_chars(xbuf[totlen - 1], expanded[0]))) { xbuf[totlen++] = '@'; xbuf[totlen++] = ' '; @@ -3032,9 +3032,9 @@ memcpy(xbuf + totlen, expanded, arg->expand_length); totlen += arg->expand_length; - if (!ap->raw_after && totlen > 0 && offset < defn->length - && !CPP_TRADITIONAL(pfile) - && unsafe_chars(xbuf[totlen - 1], exp[offset])) + if ((!ap->raw_after) && (totlen > 0) && (offset < defn->length) + && (!CPP_TRADITIONAL(pfile)) + && (unsafe_chars(xbuf[totlen - 1], exp[offset]))) { xbuf[totlen++] = '@'; xbuf[totlen++] = ' '; @@ -3043,7 +3043,7 @@ * then only expand the newlines once. This avoids creating * output lines which don't correspond to any input line, * which confuses gdb and gcov. */ - if (arg->use_count > 1 && arg->newlines > 0) + if ((arg->use_count > 1) && (arg->newlines > 0)) { /* Don't bother doing change_newlines for subsequent * uses of arg. */ @@ -3065,8 +3065,8 @@ /* if we've reached the end of the macro */ if (exp[i] == ')') rest_zero = 0; - if (!(rest_zero && last_ap && last_ap->rest_args - && last_ap->raw_after)) + if (!((rest_zero) && (last_ap) && (last_ap->rest_args) + && (last_ap->raw_after))) xbuf[totlen++] = exp[i]; } @@ -3120,9 +3120,9 @@ * Also, we don't need the extra space if the first char is '(', * or some other (less common) characters. */ - if (xbuf[0] == '@' && xbuf[1] == ' ' - && (is_idchar[xbuf[2]] || xbuf[2] == '(' || xbuf[2] == '\'' - || xbuf[2] == '\"')) + if ((xbuf[0] == '@') && (xbuf[1] == ' ') + && ((is_idchar[xbuf[2]]) || (xbuf[2] == '(') || (xbuf[2] == '\'') + || (xbuf[2] == '\"'))) mbuf->cur += 2; } @@ -3194,9 +3194,9 @@ unused1 = NULL; unused2 = NULL; - if (importing && CPP_OPTIONS(pfile)->warn_import - && !CPP_OPTIONS(pfile)->inhibit_warnings - && !CPP_BUFFER(pfile)->system_header_p && !pfile->import_warning) + if ((importing) && (CPP_OPTIONS(pfile)->warn_import) + && (!CPP_OPTIONS(pfile)->inhibit_warnings) + && (!CPP_BUFFER(pfile)->system_header_p) && (!pfile->import_warning)) { pfile->import_warning = 1; cpp_warning(pfile, "using `#import' is not recommended"); @@ -3295,7 +3295,7 @@ if (token != CPP_VSPACE) { cpp_error(pfile, "junk at end of `#include'"); - while (token != CPP_VSPACE && token != CPP_EOF && token != CPP_POP) + while ((token != CPP_VSPACE) && (token != CPP_EOF) && (token != CPP_POP)) token = get_directive_token(pfile); } /* For #include_next, skip in the search path @@ -3376,7 +3376,7 @@ #ifdef VMS /* Change this 1/2 Unix 1/2 VMS file specification into a * full VMS file specification */ - if (searchptr->fname && (searchptr->fname[0] != 0)) + if ((searchptr->fname) && (searchptr->fname[0] != 0)) { /* Fix up the filename */ hack_vms_include_specification(fname); @@ -3405,7 +3405,7 @@ if (f == -2) return 0; /* Already included this file */ #ifdef EACCES - else if (f == -1 && errno == EACCES) + else if ((f == -1) && (errno == EACCES)) cpp_warning(pfile, "Header file %s exists, but is not readable", fname); #endif @@ -3424,9 +3424,9 @@ * or other similar place; these missing files may be generated from * other files and may not exist yet (eg: y.tab.h). */ - if (CPP_OPTIONS(pfile)->print_deps_missing_files - && CPP_PRINT_DEPS(pfile) - > (angle_brackets || (pfile->system_include_depth > 0))) + if ((CPP_OPTIONS(pfile)->print_deps_missing_files) + && (CPP_PRINT_DEPS(pfile) + > ((angle_brackets) || (pfile->system_include_depth > 0)))) { /* If it was requested as a system header file, * then assume it belongs in the first place to look for such. */ @@ -3463,9 +3463,9 @@ * still produce correct output. Otherwise, we can't produce correct * output, because there may be dependencies we need inside the missing * file, and we don't know what directory this missing file exists in. */ - else if (CPP_PRINT_DEPS(pfile) + else if ((CPP_PRINT_DEPS(pfile)) && (CPP_PRINT_DEPS(pfile) - <= (angle_brackets || (pfile->system_include_depth > 0)))) + <= ((angle_brackets) || (pfile->system_include_depth > 0)))) cpp_warning(pfile, "No include path in which to find %s", fname); else if (search_start) cpp_error_from_errno(pfile, fname); @@ -3510,7 +3510,7 @@ /* For -M, add this file to the dependencies. */ if (CPP_PRINT_DEPS(pfile) - > (angle_brackets || (pfile->system_include_depth > 0))) + > ((angle_brackets) || (pfile->system_include_depth > 0))) deps_output(pfile, fname, ' '); } /* Handle -H option. */ @@ -3558,9 +3558,9 @@ file_name_list *l = pfile->all_include_files; for (; l; l = l->next) - if (!strcmp(name, l->fname) - && l->control_macro - && cpp_lookup((const char *)l->control_macro, -1, -1)) + if ((!strcmp(name, l->fname)) + && (l->control_macro) + && (cpp_lookup((const char *)l->control_macro, -1, -1))) return 1; return 0; } @@ -3588,7 +3588,7 @@ char *sys_dir = searchptr->fname; unsigned length = strlen(sys_dir); - if (!strncmp(sys_dir, filename, length) && filename[length] == '/') + if ((!strncmp(sys_dir, filename, length)) && (filename[length] == '/')) { if (searchptr->c_system_include_path) return 2; @@ -3649,7 +3649,7 @@ bucket = pfile->assertion_hashtab[hash]; while (bucket) { - if (bucket->length == len && strncmp(bucket->name, name, len) == 0) + if ((bucket->length == len) && (strncmp(bucket->name, name, len) == 0)) return bucket; bucket = bucket->next; } @@ -3751,7 +3751,7 @@ keyword = NULL; unused1 = unused2 = NULL; - if (token != CPP_NUMBER || !isdigit(pfile->token_buffer[old_written])) + if ((token != CPP_NUMBER) || (!isdigit(pfile->token_buffer[old_written]))) { cpp_error(pfile, "invalid format `#line' command"); goto bad_line_directive; @@ -3763,7 +3763,7 @@ CPP_SET_WRITTEN(pfile, old_written); /* NEW_LINENO is one less than the actual line number here. */ - if (CPP_PEDANTIC(pfile) && new_lineno < 0) + if ((CPP_PEDANTIC(pfile)) && (new_lineno < 0)) cpp_pedwarn(pfile, "line number out of range in `#line' command"); token = get_directive_token(pfile); @@ -3791,13 +3791,13 @@ num_start = CPP_WRITTEN(pfile); token = get_directive_token(pfile); - if (token != CPP_VSPACE && token != CPP_EOF && token != CPP_POP) + if ((token != CPP_VSPACE) && (token != CPP_EOF) && (token != CPP_POP)) { p = pfile->token_buffer + num_start; if (CPP_PEDANTIC(pfile)) cpp_pedwarn(pfile, "garbage at end of `#line' command"); - if (token != CPP_NUMBER || *p < '0' || *p > '4' || p[1] != '\0') + if ((token != CPP_NUMBER) || (*p < '0') || (*p > '4') || (p[1] != '\0')) { cpp_error(pfile, "invalid format `#line' command"); goto bad_line_directive; @@ -3814,8 +3814,8 @@ CPP_SET_WRITTEN(pfile, num_start); token = get_directive_token(pfile); p = pfile->token_buffer + num_start; - if (token == CPP_NUMBER && p[1] == '\0' - && (*p == '3' || *p == '4')) + if ((token == CPP_NUMBER) && (p[1] == '\0') + && ((*p == '3') || (*p == '4'))) { ip->system_header_p = *p == 3 ? 1 : 2; token = get_directive_token(pfile); @@ -3828,8 +3828,8 @@ } hash_bucket = &fname_table[hashf(fname, fname_length, FNAME_HASHSIZE)]; for (hp = *hash_bucket; hp; hp = hp->next) - if (hp->length == fname_length && - strncmp(hp->value.cpval, fname, fname_length) == 0) + if ((hp->length == fname_length) && + (strncmp(hp->value.cpval, fname, fname_length) == 0)) { ip->nominal_fname = hp->value.cpval; break; @@ -3847,7 +3847,7 @@ memcpy(hp->value.cpval, fname, fname_length); } } - else if (token != CPP_VSPACE && token != CPP_EOF) + else if ((token != CPP_VSPACE) && (token != CPP_EOF)) { cpp_error(pfile, "invalid format `#line' command"); goto bad_line_directive; @@ -3881,7 +3881,7 @@ { /* If we are generating additional info for debugging (with -g) we * need to pass through all effective #undef commands. */ - if (CPP_OPTIONS(pfile)->debug_output && keyword) + if ((CPP_OPTIONS(pfile)->debug_output) && (keyword)) pass_thru_directive((char *)orig_buf, (char *)limit, pfile, keyword); if (hp->type != T_MACRO) cpp_warning(pfile, "undefining `%s'", hp->name); @@ -3978,7 +3978,7 @@ /* long old_written = CPP_WRITTEN (pfile); */ /* Allow #ident in system headers, since that's not user's fault. */ - if (CPP_PEDANTIC(pfile) && !CPP_BUFFER(pfile)->system_header_p) + if ((CPP_PEDANTIC(pfile)) && (!CPP_BUFFER(pfile)->system_header_p)) cpp_pedwarn(pfile, "ANSI C does not allow `#ident'"); keyword = NULL; @@ -3996,7 +3996,7 @@ do_pragma(cpp_reader * pfile, struct directive *keyword, unsigned char *buf, unsigned char *limit) { - while (*buf == ' ' || *buf == '\t') + while ((*buf == ' ') || (*buf == '\t')) buf++; keyword = NULL; @@ -4018,7 +4018,7 @@ int fname_len; SKIP_WHITE_SPACE(p); - if (*p == '\n' || *p != '\"') + if ((*p == '\n') || (*p != '\"')) return 0; fname = p + 1; @@ -4029,7 +4029,7 @@ { inc_fname = strrchr(ptr->fname, '/'); inc_fname = inc_fname ? inc_fname + 1 : (char *)ptr->fname; - if (inc_fname && !strncmp(inc_fname, fname, fname_len)) + if ((inc_fname) && (!strncmp(inc_fname, fname, fname_len))) cpp_warning(pfile, "`#pragma implementation' for `%s' appears after file is included", fname); @@ -4083,13 +4083,13 @@ } else { - if (pfile->if_stack->type != T_IF && pfile->if_stack->type != T_ELIF) + if ((pfile->if_stack->type != T_IF) && (pfile->if_stack->type != T_ELIF)) { cpp_error(pfile, "`#elif' after `#else'"); - if (pfile->if_stack->fname - && CPP_BUFFER(pfile)->fname - && strcmp(pfile->if_stack->fname, - CPP_BUFFER(pfile)->nominal_fname) != 0) + if ((pfile->if_stack->fname) + && (CPP_BUFFER(pfile)->fname) + && (strcmp(pfile->if_stack->fname, + CPP_BUFFER(pfile)->nominal_fname) != 0)) fprintf(stderr, ", file %s", pfile->if_stack->fname); fprintf(stderr, ")\n"); } @@ -4160,7 +4160,7 @@ unused1 = NULL; unused2 = NULL; /* Detect a #ifndef at start of file (not counting comments). */ - if (ip->fname != 0 && keyword->type == T_IFNDEF) + if ((ip->fname != 0) && (keyword->type == T_IFNDEF)) start_of_file = pfile->only_seen_white == 2; pfile->no_macro_expand++; @@ -4171,7 +4171,7 @@ ident_length = CPP_WRITTEN(pfile) - old_written; CPP_SET_WRITTEN(pfile, old_written); /* Pop */ - if (token == CPP_VSPACE || token == CPP_POP || token == CPP_EOF) + if ((token == CPP_VSPACE) || (token == CPP_POP) || (token == CPP_EOF)) { skip = (keyword->type == T_IFDEF); if (!CPP_TRADITIONAL(pfile)) @@ -4182,7 +4182,7 @@ HASHNODE *hp = cpp_lookup(ident, ident_length, -1); skip = (!hp) ^ (keyword->type == T_IFNDEF); - if (start_of_file && !skip) + if ((start_of_file) && (!skip)) { control_macro = (unsigned char *)xmalloc(ident_length + 1); memcpy(control_macro, ident, ident_length + 1); @@ -4201,7 +4201,7 @@ cpp_skip_hspace(pfile); c = PEEKC(); - if (c != EOF && c != '\n') + if ((c != EOF) && (c != '\n')) cpp_pedwarn(pfile, "garbage at end of `#%s' argument", keyword->name); } @@ -4296,8 +4296,8 @@ { IF_STACK_FRAME *temp; - if (ident_length == kt->length - && strncmp(ident, kt->name, kt->length) == 0) + if ((ident_length == kt->length) + && (strncmp(ident, kt->name, kt->length) == 0)) { /* If we are asked to return on next directive, do so now. */ if (any) @@ -4318,8 +4318,8 @@ break; case T_ELSE: case T_ENDIF: - if (CPP_PEDANTIC(pfile) - && pfile->if_stack != save_if_stack) + if ((CPP_PEDANTIC(pfile)) + && (pfile->if_stack != save_if_stack)) validate_else(pfile, kt->type == T_ELSE ? "#else" : "#endif"); @@ -4351,8 +4351,8 @@ break; } /* Don't let erroneous code go by. */ - if (kt->length < 0 && !CPP_OPTIONS(pfile)->lang_asm - && CPP_PEDANTIC(pfile)) + if ((kt->length < 0) && (!CPP_OPTIONS(pfile)->lang_asm) + && (CPP_PEDANTIC(pfile))) cpp_pedwarn(pfile, "invalid preprocessor directive name"); } c = GETC(); @@ -4434,7 +4434,7 @@ * if it has a #else clause. */ pfile->if_stack->control_macro = 0; - if (pfile->if_stack->type != T_IF && pfile->if_stack->type != T_ELIF) + if ((pfile->if_stack->type != T_IF) && (pfile->if_stack->type != T_ELIF)) { cpp_error(pfile, "`#else' after `#else'"); fprintf(stderr, " (matches line %d", pfile->if_stack->lineno); @@ -4539,7 +4539,7 @@ cpp_skip_hspace(pfile); c = PEEKC(); - if (c != EOF && c != '\n') + if ((c != EOF) && (c != '\n')) cpp_pedwarn(pfile, "text following `%s' violates ANSI standard", directive); } @@ -4574,7 +4574,7 @@ cpp_buffer *next_buf = CPP_PREV_BUFFER(CPP_BUFFER(pfile)); CPP_BUFFER(pfile)->seen_eof = 1; - if (CPP_BUFFER(pfile)->nominal_fname && next_buf) + if ((CPP_BUFFER(pfile)->nominal_fname) && (next_buf)) { /* We're about to return from an #include file. * Emit #line information now (as part of the CPP_POP) result. @@ -4605,7 +4605,7 @@ cpp_buf_line_and_col(cpp_file_buffer(pfile), &start_line, &start_column); c = skip_comment(pfile, &newlines); - if (opts->put_out_comments && (c == '/' || c == EOF)) + if ((opts->put_out_comments) && ((c == '/') || (c == EOF))) parse_clear_mark(&start_mark); if (c == '/') goto randomchar; @@ -4684,8 +4684,8 @@ { cpp_error_with_line(pfile, start_line, start_column, "unterminated string or character constant"); - if (pfile->multiline_string_line != start_line - && pfile->multiline_string_line != 0) + if ((pfile->multiline_string_line != start_line) + && (pfile->multiline_string_line != 0)) cpp_error_with_line(pfile, pfile->multiline_string_line, -1, @@ -4708,8 +4708,8 @@ "unterminated character constant"); goto while2end; } - if (CPP_PEDANTIC(pfile) - && pfile->multiline_string_line == 0) + if ((CPP_PEDANTIC(pfile)) + && (pfile->multiline_string_line == 0)) { cpp_pedwarn_with_line(pfile, start_line, start_column, @@ -4756,7 +4756,7 @@ goto letter; case ':': - if (opts->cplusplus && PEEKC() == ':') + if ((opts->cplusplus) && (PEEKC() == ':')) goto op2; goto randomchar; @@ -4765,7 +4765,7 @@ case '|': NEWLINE_FIX; c2 = PEEKC(); - if (c2 == c || c2 == '=') + if ((c2 == c) || (c2 == '=')) goto op2; goto randomchar; @@ -4782,7 +4782,7 @@ case '-': NEWLINE_FIX; c2 = PEEKC(); - if (c2 == '-' && opts->chill) + if ((c2 == '-') && (opts->chill)) { /* Chill style comment */ if (opts->put_out_comments) @@ -4803,7 +4803,7 @@ c = '-'; goto return_comment; } - if (c2 == '-' || c2 == '=' || c2 == '>') + if ((c2 == '-') || (c2 == '=') || (c2 == '>')) goto op2; goto randomchar; @@ -4817,7 +4817,7 @@ break; c = GETC(); NEWLINE_FIX1(c); - if (c == '\n' || c == EOF) + if ((c == '\n') || (c == EOF)) { cpp_error(pfile, "missing '>' in `#include '"); @@ -4884,7 +4884,7 @@ goto number; } /* FIXME - misses the case "..\\\n." */ - if (c2 == '.' && PEEKN(1) == '.') + if ((c2 == '.') && (PEEKN(1) == '.')) { CPP_RESERVE(pfile, 4); CPP_PUTC_Q(pfile, '.'); @@ -4910,7 +4910,7 @@ case 'L': NEWLINE_FIX; c2 = PEEKC(); - if ((c2 == '\'' || c2 == '\"') && !CPP_TRADITIONAL(pfile)) + if (((c2 == '\'') || (c2 == '\"')) && (!CPP_TRADITIONAL(pfile))) { CPP_PUTC(pfile, c); c = GETC(); @@ -4938,8 +4938,8 @@ c = PEEKC(); if (c == EOF) break; - if (!is_idchar[c] && c != '.' - && ((c2 != 'e' && c2 != 'E') || (c != '+' && c != '-'))) + if ((!is_idchar[c]) && (c != '.') + && (((c2 != 'e') && (c2 != 'E')) || ((c != '+') && (c != '-')))) break; FORWARD(1); c2 = c; @@ -4957,7 +4957,7 @@ case 'D': case 'H': case 'O': - if (opts->chill && PEEKC() == '\'') + if ((opts->chill) && (PEEKC() == '\'')) { pfile->only_seen_white = 0; CPP_RESERVE(pfile, 2); @@ -4971,7 +4971,7 @@ goto chill_number_eof; if (!is_idchar[c]) { - if (c == '\\' && PEEKC() == '\n') + if ((c == '\\') && (PEEKC() == '\n')) { FORWARD(2); continue; @@ -5076,7 +5076,7 @@ * first skip all whitespace, copying it to the output * after the macro name. Then, if there is no '(', * decide this is not a macro call and leave things that way. */ - if (hp->type == T_MACRO && hp->value.defn->nargs >= 0) + if ((hp->type == T_MACRO) && (hp->value.defn->nargs >= 0)) { struct parse_marker macro_mark; int is_macro_call; @@ -5137,15 +5137,15 @@ * to prevent accidental token pasting. We prefer to avoid * unneeded extra spaces (for the sake of cpp-using tools like * imake). Here we remove the space if it is safe to do so. */ - if (pfile->buffer->rlimit - pfile->buffer->cur >= 3 - && pfile->buffer->rlimit[-2] == '@' - && pfile->buffer->rlimit[-1] == ' ') + if ((pfile->buffer->rlimit - pfile->buffer->cur >= 3) + && (pfile->buffer->rlimit[-2] == '@') + && (pfile->buffer->rlimit[-1] == ' ')) { int c1 = pfile->buffer->rlimit[-3]; c2 = CPP_BUF_PEEK(CPP_PREV_BUFFER(CPP_BUFFER(pfile))); - if (c2 == EOF || !unsafe_chars(c1, c2)) + if ((c2 == EOF) || (!unsafe_chars(c1, c2))) pfile->buffer->rlimit -= 2; } } @@ -5159,7 +5159,7 @@ { CPP_PUTC(pfile, c); c = PEEKC(); - if (c == EOF || !is_hor_space[c]) + if ((c == EOF) || (!is_hor_space[c])) break; FORWARD(1); } @@ -5238,7 +5238,7 @@ { if (!is_idchar[c]) { - if (c == '\\' && PEEKC() == '\n') + if ((c == '\\') && (PEEKC() == '\n')) { FORWARD(2); continue; @@ -5307,9 +5307,9 @@ { /* Compare the inode and the device. * Supposedly on some systems the inode is not a scalar. */ - if (!memcmp - ((char *)&i->inode, (char *)&sb.st_ino, sizeof(sb.st_ino)) - && i->dev == sb.st_dev) + if ((!memcmp + ((char *)&i->inode, (char *)&sb.st_ino, sizeof(sb.st_ino))) + && (i->dev == sb.st_dev)) { close(fd); return -2; /* return found */ @@ -5373,7 +5373,7 @@ if (!is_space[ch]) { *set++ = ch; - while ((ch = getc(f)) != EOF && !is_space[ch]) + while (((ch = getc(f)) != EOF) && (!is_space[ch])) { if (set - alloc == len) { @@ -5441,7 +5441,7 @@ if (is_space[ch]) continue; from = read_filename_string(ch, f); - while ((ch = getc(f)) != EOF && is_hor_space[ch]); + while (((ch = getc(f)) != EOF) && (is_hor_space[ch])); to = read_filename_string(ch, f); ptr = @@ -5490,7 +5490,7 @@ const char *from; const char *p, *dir; - if (searchptr && !searchptr->got_name_map) + if ((searchptr) && (!searchptr->got_name_map)) { searchptr->name_map = read_name_map(pfile, searchptr->fname @@ -5498,7 +5498,7 @@ searchptr->got_name_map = 1; } /* First check the mapping for the directory we are using. */ - if (searchptr && searchptr->name_map) + if ((searchptr) && (searchptr->name_map)) { from = filename; if (searchptr->fname) @@ -5519,10 +5519,10 @@ p = strrchr(filename, '/'); if (!p) p = filename; - if (searchptr - && searchptr->fname - && strlen(searchptr->fname) == (unsigned)(p - filename) - && !strncmp(searchptr->fname, filename, p - filename)) + if ((searchptr) + && (searchptr->fname) + && (strlen(searchptr->fname) == (unsigned)(p - filename)) + && (!strncmp(searchptr->fname, filename, p - filename))) { /* FILENAME is in SEARCHPTR, which we've already checked. */ return open(filename, O_RDONLY, 0666); @@ -5642,9 +5642,9 @@ length = st_size; } - if ((length > 0 && fp->buf[length - 1] != '\n') + if (((length > 0) && (fp->buf[length - 1] != '\n')) /* Backslash-newline at end is not good enough. */ - || (length > 1 && fp->buf[length - 2] == '\\')) + || ((length > 1) && (fp->buf[length - 2] == '\\'))) { fp->buf[length++] = '\n'; } @@ -5690,7 +5690,7 @@ * but that seems pointless: it comes before them, so it overrides them * anyway. */ p = (char *)getenv("CPATH"); - if (p && !opts->no_standard_includes) + if ((p) && (!opts->no_standard_includes)) path_include(pfile, p); /* Now that dollars_in_ident is known, initialize is_idchar. */ @@ -5720,23 +5720,23 @@ { char *q; - while (*p == ' ' || *p == '\t') + while ((*p == ' ') || (*p == '\t')) p++; /* Handle -D options. */ - if (p[0] == '-' && p[1] == 'D') + if ((p[0] == '-') && (p[1] == 'D')) { q = &p[2]; - while (*p && *p != ' ' && *p != '\t') + while ((*p) && (*p != ' ') && (*p != '\t')) p++; if (*p != 0) *p++ = 0; if (opts->debug_output) output_line_command(pfile, 0, same_file); cpp_define(pfile, (unsigned char *)q); - while (*p == ' ' || *p == '\t') + while ((*p == ' ') || (*p == '\t')) p++; } - else if (p[0] == '-' && p[1] == 'A') + else if ((p[0] == '-') && (p[1] == 'A')) { /* Handle -A options (assertions). */ char *assertion; @@ -5749,30 +5749,30 @@ assertion = &p[2]; past_name = assertion; /* Locate end of name. */ - while (*past_name && *past_name != ' ' - && *past_name != '\t' && *past_name != '(') + while ((*past_name) && (*past_name != ' ') + && (*past_name != '\t') && (*past_name != '(')) past_name++; /* Locate `(' at start of value. */ value = past_name; - while (*value && (*value == ' ' || *value == '\t')) + while ((*value) && ((*value == ' ') || (*value == '\t'))) value++; if (*value++ != '(') abort(); - while (*value && (*value == ' ' || *value == '\t')) + while ((*value) && ((*value == ' ') || (*value == '\t'))) value++; past_value = value; /* Locate end of value. */ - while (*past_value && *past_value != ' ' - && *past_value != '\t' && *past_value != ')') + while ((*past_value) && (*past_value != ' ') + && (*past_value != '\t') && (*past_value != ')')) past_value++; termination = past_value; - while (*termination - && (*termination == ' ' || *termination == '\t')) + while ((*termination) + && ((*termination == ' ') || (*termination == '\t'))) termination++; if (*termination++ != ')') abort(); - if (*termination && *termination != ' ' - && *termination != '\t') + if ((*termination) && (*termination != ' ') + && (*termination != '\t')) abort(); /* Temporarily null-terminate the value. */ save_char = *termination; @@ -5781,7 +5781,7 @@ make_assertion(pfile, "-A", assertion); *termination = (char)save_char; p = termination; - while (*p == ' ' || *p == '\t') + while ((*p == ' ') || (*p == '\t')) p++; } else @@ -5798,7 +5798,7 @@ for (pend = opts->pending; pend; pend = pend->next) { - if (pend->cmd && pend->cmd[0] == '-') + if ((pend->cmd) && (pend->cmd[0] == '-')) { switch (pend->cmd[1]) { @@ -5865,7 +5865,7 @@ while (1) { /* Handle cases like c:/usr/lib:d:/gcc/lib */ - if ((*endp == PATH_SEPARATOR) || *endp == 0) + if ((*endp == PATH_SEPARATOR) || (*endp == 0)) { strncpy(nstore, startp, endp - startp); if (endp == startp) @@ -5911,13 +5911,13 @@ } /* Search "translated" versions of GNU directories. * These have /usr/local/lib/gcc... replaced by specd_prefix. */ - if (specd_prefix && default_len != 0) + if ((specd_prefix) && (default_len != 0)) for (di = include_defaults; di->fname; di++) { /* Some standard dirs are only for C++. */ - if (!di->cplusplus - || (opts->cplusplus - && !opts->no_standard_cplusplus_includes)) + if ((!di->cplusplus) + || ((opts->cplusplus) + && (!opts->no_standard_cplusplus_includes))) { /* Does this dir start with the prefix? */ if (!strncmp(di->fname, default_prefix, default_len)) @@ -5948,8 +5948,8 @@ for (di = include_defaults; di->fname; di++) { /* Some standard dirs are only for C++. */ - if (!di->cplusplus - || (opts->cplusplus && !opts->no_standard_cplusplus_includes)) + if ((!di->cplusplus) + || ((opts->cplusplus) && (!opts->no_standard_cplusplus_includes))) { file_name_list *new_ = (file_name_list *) xmalloc(sizeof(file_name_list)); @@ -5991,7 +5991,7 @@ pfile->no_record_file++; for (pend = opts->pending; pend; pend = pend->next) { - if (pend->cmd && strcmp(pend->cmd, "-imacros") == 0) + if ((pend->cmd) && (strcmp(pend->cmd, "-imacros") == 0)) { int fd = open(pend->arg, O_RDONLY, 0666); @@ -6010,7 +6010,7 @@ /* Copy the entire contents of the main input file into * the stacked input buffer previously allocated for it. */ - if (!fname || *fname == 0) + if ((!fname) || (*fname == 0)) { fname = ""; f = 0; @@ -6021,8 +6021,8 @@ /* -MG doesn't select the form of output and must be specified with one of * -M or -MM. -MG doesn't make sense with -MD or -MMD since they don't * inhibit compilation. */ - if (opts->print_deps_missing_files - && (opts->print_deps == 0 || !opts->no_output)) + if ((opts->print_deps_missing_files) + && ((opts->print_deps == 0) || (!opts->no_output))) cpp_fatal("-MG must be specified with one of -M or -MM"); /* Either of two environment variables can specify output of deps. @@ -6030,9 +6030,9 @@ * where OUTPUT_FILE is the file to write deps info to * and DEPS_TARGET is the target to mention in the deps. */ - if (opts->print_deps == 0 - && (getenv("SUNPRO_DEPENDENCIES") != 0 - || getenv("DEPENDENCIES_OUTPUT") != 0)) + if ((opts->print_deps == 0) + && ((getenv("SUNPRO_DEPENDENCIES") != 0) + || (getenv("DEPENDENCIES_OUTPUT") != 0))) { char *spec = getenv("DEPENDENCIES_OUTPUT"); char *s; @@ -6049,7 +6049,7 @@ s = spec; /* Find the space before the DEPS_TARGET, if there is one. */ /* This should use index. (mrs) */ - while (*s != 0 && *s != ' ') + while ((*s != 0) && (*s != ' ')) s++; if (*s != 0) { @@ -6103,21 +6103,21 @@ /* Output P, but remove known suffixes. */ len = strlen(p); q = p + len; - if (len >= 2 && p[len - 2] == '.' && strchr("cCsSm", p[len - 1])) + if ((len >= 2) && (p[len - 2] == '.') && (strchr("cCsSm", p[len - 1]))) q = p + (len - 2); - else if (len >= 3 - && p[len - 3] == '.' - && p[len - 2] == 'c' && p[len - 1] == 'c') + else if ((len >= 3) + && (p[len - 3] == '.') + && (p[len - 2] == 'c') && (p[len - 1] == 'c')) q = p + (len - 3); - else if (len >= 4 - && p[len - 4] == '.' - && p[len - 3] == 'c' - && p[len - 2] == 'x' && p[len - 1] == 'x') + else if ((len >= 4) + && (p[len - 4] == '.') + && (p[len - 3] == 'c') + && (p[len - 2] == 'x') && (p[len - 1] == 'x')) q = p + (len - 4); - else if (len >= 4 - && p[len - 4] == '.' - && p[len - 3] == 'c' - && p[len - 2] == 'p' && p[len - 1] == 'p') + else if ((len >= 4) + && (p[len - 4] == '.') + && (p[len - 3] == 'c') + && (p[len - 2] == 'p') && (p[len - 1] == 'p')) q = p + (len - 4); /* Supply our own suffix. */ @@ -6135,7 +6135,7 @@ opts->pending = nreverse_pending(opts->pending); for (pend = opts->pending; pend; pend = pend->next) { - if (pend->cmd && strcmp(pend->cmd, "-include") == 0) + if ((pend->cmd) && (strcmp(pend->cmd, "-include") == 0)) { int fd = open(pend->arg, O_RDONLY, 0666); @@ -6238,8 +6238,8 @@ { case 'i': - if (!strcmp(argv[i], "-include") - || !strcmp(argv[i], "-imacros")) + if ((!strcmp(argv[i], "-include")) + || (!strcmp(argv[i], "-imacros"))) { if (i + 1 == argc) cpp_fatal("Filename missing after `%s' option", @@ -6509,7 +6509,7 @@ else if (!strcmp(argv[i], "-MMD")) opts->print_deps = 1; /* For -MD and -MMD options, write deps on file named by next arg. */ - if (!strcmp(argv[i], "-MD") || !strcmp(argv[i], "-MMD")) + if ((!strcmp(argv[i], "-MD")) || (!strcmp(argv[i], "-MMD"))) { if (i + 1 == argc) cpp_fatal("Filename missing after %s option", @@ -6601,9 +6601,9 @@ { struct cpp_pending *pend = *ptr; - if (pend->cmd && pend->cmd[0] == '-' - && (pend->cmd[1] == 'D' - || pend->cmd[1] == 'A')) + if ((pend->cmd) && (pend->cmd[0] == '-') + && ((pend->cmd[1] == 'D') + || (pend->cmd[1] == 'A'))) { *ptr = pend->next; free(pend); @@ -6647,8 +6647,8 @@ { file_name_list *dirtmp; - if (!CPP_OPTIONS(pfile)->ignore_srcdir - && !strcmp(argv[i] + 2, "-")) + if ((!CPP_OPTIONS(pfile)->ignore_srcdir) + && (!strcmp(argv[i] + 2, "-"))) { CPP_OPTIONS(pfile)->ignore_srcdir = 1; /* Don't use any preceding -I directories for #include <...>. */ @@ -6734,7 +6734,7 @@ putc('\n', deps_stream); if (opts->deps_file) { - if (ferror(deps_stream) || fclose(deps_stream) != 0) + if ((ferror(deps_stream)) || (fclose(deps_stream) != 0)) cpp_fatal("I/O error on output"); } } @@ -6750,8 +6750,8 @@ int sym_length; /* and how long it is */ struct arglist *tokens = NULL; - if (CPP_PEDANTIC(pfile) && CPP_OPTIONS(pfile)->done_initializing - && !CPP_BUFFER(pfile)->system_header_p) + if ((CPP_PEDANTIC(pfile)) && (CPP_OPTIONS(pfile)->done_initializing) + && (!CPP_BUFFER(pfile)->system_header_p)) cpp_pedwarn(pfile, "ANSI C does not allow `#assert'"); keyword = NULL; @@ -6783,7 +6783,7 @@ } cpp_skip_hspace(pfile); c = PEEKC(); - if (c != EOF && c != '\n') + if ((c != EOF) && (c != '\n')) cpp_pedwarn(pfile, "junk at end of `#assert'"); skip_rest_of_line(pfile); } @@ -6802,7 +6802,7 @@ hp = assertion_lookup(pfile, symname, sym_length, hashcode); if (!hp) { - if (sym_length == 7 && !strncmp(symname, "defined", sym_length)) + if ((sym_length == 7) && (!strncmp(symname, "defined", sym_length))) cpp_error(pfile, "`defined' redefined as assertion"); hp = assertion_install(pfile, symname, sym_length, hashcode); } @@ -6834,8 +6834,8 @@ buf = NULL; limit = NULL; - if (CPP_PEDANTIC(pfile) && CPP_OPTIONS(pfile)->done_initializing - && !CPP_BUFFER(pfile)->system_header_p) + if ((CPP_PEDANTIC(pfile)) && (CPP_OPTIONS(pfile)->done_initializing) + && (!CPP_BUFFER(pfile)->system_header_p)) cpp_pedwarn(pfile, "ANSI C does not allow `#unassert'"); cpp_skip_hspace(pfile); @@ -6862,7 +6862,7 @@ } cpp_skip_hspace(pfile); c = PEEKC(); - if (c != EOF && c != '\n') + if ((c != EOF) && (c != '\n')) cpp_error(pfile, "junk at end of `#unassert'"); skip_rest_of_line(pfile); @@ -6929,7 +6929,7 @@ ASSERTION_HASHNODE *hp; int hashcode = hashf(name, sym_length, ASSERTION_HASHSIZE); - if (CPP_PEDANTIC(pfile) && !CPP_BUFFER(pfile)->system_header_p) + if ((CPP_PEDANTIC(pfile)) && (!CPP_BUFFER(pfile)->system_header_p)) cpp_pedwarn(pfile, "ANSI C does not allow testing assertions"); hp = assertion_lookup(pfile, name, sym_length, hashcode); @@ -6966,7 +6966,7 @@ static int compare_token_lists(struct arglist *l1, struct arglist *l2) { - while (l1 && l2) + while ((l1) && (l2)) { if (l1->length != l2->length) return 0; @@ -7032,7 +7032,7 @@ break; CPP_PUTC(pfile, c); } - else if (c == '"' || c == '\'') + else if ((c == '"') || (c == '\'')) { FORWARD(-1); cpp_get_token(pfile); @@ -7041,8 +7041,8 @@ break; else { - while (c != EOF && !is_space[c] && c != '(' && c != ')' - && c != '"' && c != '\'') + while ((c != EOF) && (!is_space[c]) && (c != '(') && (c != ')') + && (c != '"') && (c != '\'')) { CPP_PUTC(pfile, c); c = GETC(); @@ -7064,7 +7064,7 @@ CPP_ADJUST_WRITTEN(pfile, -length); /* pop */ - if (c == EOF || c == '\n') + if ((c == EOF) || (c == '\n')) { /* FIXME */ cpp_error(pfile, "unterminated token sequence following `#' operator"); @@ -7362,8 +7362,8 @@ const char *msg, const char *arg1, const char *arg2, const char *arg3) { - if (!CPP_OPTIONS(pfile)->pedantic_errors - && CPP_OPTIONS(pfile)->inhibit_warnings) + if ((!CPP_OPTIONS(pfile)->pedantic_errors) + && (CPP_OPTIONS(pfile)->inhibit_warnings)) return; if (file) cpp_file_line_for_message(pfile, file, line, -1); Index: E16/e/eesh/main.c =================================================================== --- E16/e/eesh/main.c (revision 51690) +++ E16/e/eesh/main.c (working copy) @@ -166,7 +166,7 @@ /* CommsSend(e, "set pixmap 0"); */ #endif - if (!command && i < argc) + if ((!command) && (i < argc)) { mode = 1; len = 0; Index: E16/e/src/dialog.c =================================================================== --- E16/e/src/dialog.c (revision 51690) +++ E16/e/src/dialog.c (working copy) @@ -372,10 +372,10 @@ { Dialog *d = (Dialog *) ewin->data; - if (!d || Mode.mode != MODE_NONE || !EoIsShown(ewin)) + if ((!d) || (Mode.mode != MODE_NONE) || (!EoIsShown(ewin))) return; - if (TransparencyUpdateNeeded() || ImageclassIsTransparent(d->iclass)) + if ((TransparencyUpdateNeeded()) || (ImageclassIsTransparent(d->iclass))) DialogRedraw(d); } @@ -455,7 +455,7 @@ else { EwinResize(ewin, d->w, d->h); - if (center || FindADialog() == 1) + if ((center) || (FindADialog() == 1)) ArrangeEwinCentered(ewin); else ArrangeEwin(ewin); @@ -506,7 +506,7 @@ { DItem *content; - if (Conf.dialogs.headers && (dd->header_image || dd->header_text)) + if ((Conf.dialogs.headers) && ((dd->header_image) || (dd->header_text))) DialogAddHeader(d, parent, dd->header_image, _(dd->header_text)); content = DialogAddItem(parent, DITEM_TABLE); @@ -778,7 +778,7 @@ EImage *im; EImageBorder *pad; - if (di->realized && di->type != DITEM_TABLE) + if ((di->realized) && (di->type != DITEM_TABLE)) return; di->realized = 1; @@ -817,7 +817,7 @@ iclass = "DIALOG_WIDGET_AREA"; } - if (!di->iclass && iclass) + if ((!di->iclass) && (iclass)) { di->iclass = ImageclassAlloc(iclass, 1); if (!di->iclass) @@ -827,7 +827,7 @@ } } - if (!di->tclass && tclass) + if ((!di->tclass) && (tclass)) { di->tclass = TextclassAlloc(tclass, 1); if (!di->tclass) @@ -1039,7 +1039,7 @@ col_size = EMALLOC(int, cols); row_size = EMALLOC(int, rows); - if (!col_size || !row_size) + if ((!col_size) || (!row_size)) goto bail_out; row_size[0] = 0; @@ -1131,7 +1131,7 @@ dii->w = sw - (dii->padding.left + dii->padding.right); if (dii->fill_v) dii->h = sh - (dii->padding.top + dii->padding.bottom); - if (dii->w <= 0 || dii->h <= 0) + if ((dii->w <= 0) || (dii->h <= 0)) goto skip; if (dii->type == DITEM_TABLE) { @@ -1250,7 +1250,7 @@ break; } - if (di->win && register_win_callback) + if ((di->win) && (register_win_callback)) EventCallbackRegister(di->win, DItemHandleEvents, di); } @@ -1349,11 +1349,11 @@ EImageBorder *pad; EImage *im; - if (!di->update && di->type != DITEM_TABLE) + if ((!di->update) && (di->type != DITEM_TABLE)) return; - if (di->x > d->xu2 || di->y > d->yu2 || - di->x + di->w <= d->xu1 || di->y + di->h <= d->yu1) + if ((di->x > d->xu2) || (di->y > d->yu2) || + (di->x + di->w <= d->xu1) || (di->y + di->h <= d->yu1)) goto done; #if DEBUG_DIALOGS @@ -1428,7 +1428,7 @@ state = STATE_CLICKED; else if ((di->hilited) && (!di->clicked)) state = STATE_HILITED; - else if (!(di->hilited) && (di->clicked)) + else if ((!(di->hilited)) && (di->clicked)) state = STATE_CLICKED; if (di->item.slider.knob_win) ImageclassApply(di->item.slider.ic_knob, @@ -1441,7 +1441,7 @@ state = STATE_CLICKED; else if ((di->hilited) && (!di->clicked)) state = STATE_HILITED; - else if (!(di->hilited) && (di->clicked)) + else if ((!(di->hilited)) && (di->clicked)) state = STATE_CLICKED; ITApply(di->win, di->iclass, NULL, state, 0, 0, ST_WIDGET, di->tclass, NULL, di->text, 0); @@ -1487,11 +1487,11 @@ state = STATE_CLICKED; else if ((di->hilited) && (!di->clicked)) state = STATE_HILITED; - else if (!(di->hilited) && (di->clicked)) + else if ((!(di->hilited)) && (di->clicked)) state = STATE_CLICKED; ImageclassApply(di->iclass, di->item.check_button.check_win, DialogItemCheckButtonGetState(di), 0, state, ST_WIDGET); - if (!d->redraw && + if ((!d->redraw) && (TextclassGetTextState(di->tclass, di->state, 0, 0) == TextclassGetTextState(di->tclass, state, 0, 0))) break; @@ -1506,11 +1506,11 @@ state = STATE_CLICKED; else if ((di->hilited) && (!di->clicked)) state = STATE_HILITED; - else if (!(di->hilited) && (di->clicked)) + else if ((!(di->hilited)) && (di->clicked)) state = STATE_CLICKED; ImageclassApply(di->iclass, di->item.radio_button.radio_win, di->item.radio_button.onoff, 0, state, ST_WIDGET); - if (!d->redraw && + if ((!d->redraw) && (TextclassGetTextState(di->tclass, di->state, 0, 0) == TextclassGetTextState(di->tclass, state, 0, 0))) break; @@ -1524,9 +1524,9 @@ draw_text: di->state = state; - if (!di->text || !di->tclass) + if ((!di->text) || (!di->tclass)) break; - if (!d->redraw || di->update) + if ((!d->redraw) || (di->update)) EXCopyArea(d->pmm_bg.pmap, WinGetPmap(d->win), di->x, di->y, di->w, di->h, di->x, di->y); TextDraw(di->tclass, d->win, WinGetPmap(d->win), 0, 0, state, di->text, @@ -1548,7 +1548,7 @@ DialogDrawItem(d, d->item); } while (d->update); - if (d->xu1 < d->xu2 && d->yu1 < d->yu2) + if ((d->xu1 < d->xu2) && (d->yu1 < d->yu2)) EClearArea(d->win, d->xu1, d->yu1, d->xu2 - d->xu1, d->yu2 - d->yu1); d->xu1 = d->yu1 = 99999; d->xu2 = d->yu2 = 0; @@ -1842,7 +1842,7 @@ break; } - if (clean && di->win) + if ((clean) && (di->win)) EDestroyWindow(di->win); ImageclassFree(di->iclass); TextclassFree(di->tclass); @@ -2011,7 +2011,7 @@ case DITEM_SLIDER: if (ev->xbutton.window == WinGetXwin(di->item.slider.knob_win)) { - if (ev->xbutton.button >= 1 && ev->xbutton.button <= 3) + if ((ev->xbutton.button >= 1) && (ev->xbutton.button <= 3)) { di->item.slider.in_drag = 1; break; @@ -2137,7 +2137,7 @@ break; } - if (di->hilited && di->clicked) + if ((di->hilited) && (di->clicked)) { if (di->func) di->func(di->dlg, di->val, di->data); Index: E16/e/src/mwm.c =================================================================== --- E16/e/src/mwm.c (revision 51690) +++ E16/e/src/mwm.c (working copy) @@ -82,7 +82,7 @@ if (!_MOTIF_WM_HINTS) _MOTIF_WM_HINTS = EInternAtom("_MOTIF_WM_HINTS"); - if (atom_change && atom_change != _MOTIF_WM_HINTS) + if ((atom_change) && (atom_change != _MOTIF_WM_HINTS)) return; ewin->mwm.valid = 1; @@ -166,7 +166,7 @@ ewin->mwm.func_close = 1; } - if (!ewin->mwm.decor_title && !ewin->mwm.decor_border) + if ((!ewin->mwm.decor_title) && (!ewin->mwm.decor_border)) ewin->props.no_border = 1; done: Index: E16/e/src/actions.c =================================================================== --- E16/e/src/actions.c (revision 51690) +++ E16/e/src/actions.c (working copy) @@ -181,7 +181,7 @@ void Espawn(int argc __UNUSED__, char **argv) { - if (!argv || !argv[0]) + if ((!argv) || (!argv[0])) return; if (fork()) Index: E16/e/src/theme.c =================================================================== --- E16/e/src/theme.c (revision 51690) +++ E16/e/src/theme.c (working copy) @@ -268,7 +268,7 @@ path = NULL; - if (!theme || !theme[0]) + if ((!theme) || (!theme[0])) { theme = NULL; } @@ -343,7 +343,7 @@ } path = ThemeFind(name); - if (!path && (!name || strcmp(name, "-"))) + if ((!path) && ((!name) || (strcmp(name, "-")))) { Alert(_("No themes were found in the default directories:\n" " %s\n" @@ -372,8 +372,8 @@ { if (val >= 2) return; - if (Conf.theme.use_theme_font_cfg == tmp_use_theme_font && - Conf.theme.use_alt_font_cfg == tmp_use_alt_font) + if ((Conf.theme.use_theme_font_cfg == tmp_use_theme_font) && + (Conf.theme.use_alt_font_cfg == tmp_use_alt_font)) return; DialogOK(_("Message"), _("Changes will take effect after restart")); @@ -439,7 +439,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { char *path; Index: E16/e/src/gnome.c =================================================================== --- E16/e/src/gnome.c (revision 51690) +++ E16/e/src/gnome.c (working copy) @@ -669,7 +669,7 @@ for (i = 0; i < num; i++) { - if (!lst[i]->props.skip_ext_task && !EwinIsTransientChild(lst[i])) + if ((!lst[i]->props.skip_ext_task) && (!EwinIsTransientChild(lst[i]))) wl[j++] = EwinGetClientXwin(lst[i]); } } Index: E16/e/src/menus-misc.c =================================================================== --- E16/e/src/menus-misc.c (revision 51690) +++ E16/e/src/menus-misc.c (working copy) @@ -102,7 +102,7 @@ dir = MenuGetData(m); lastmod = moddate(dir); - if (!menu_scan_recursive && lastmod <= MenuGetTimestamp(m)) + if ((!menu_scan_recursive) && (lastmod <= MenuGetTimestamp(m))) return 0; MenuSetTimestamp(m, lastmod); @@ -278,7 +278,7 @@ if (s[0] == '#') continue; len = strlen(s); - while (len && (s[len - 1] == '\n' || s[len - 1] == '\r')) + while ((len) && ((s[len - 1] == '\n') || (s[len - 1] == '\r'))) len--; if (len == 0) continue; @@ -462,7 +462,7 @@ static int BorderNameCompare(void *b1, void *b2) { - if (b1 && b2) + if ((b1) && (b2)) return strcmp(BorderGetName((Border *) b1), BorderGetName((Border *) b2)); return 0; @@ -503,9 +503,9 @@ static int MenuCheckShowEwinDesk(EWin * ewin, void *prm) { - if (!EwinGetTitle(ewin) || ewin->props.skip_winlist) + if ((!EwinGetTitle(ewin)) || (ewin->props.skip_winlist)) return 0; - return !prm || EwinGetDesk(ewin) == prm; + return (!prm) || (EwinGetDesk(ewin) == prm); } static void @@ -692,7 +692,7 @@ type = name; } - if (!type || !strcmp(type, "file")) + if ((!type) || (!strcmp(type, "file"))) { m = MenuCreateFromFlatFile(name, NULL, ms, prm); } Index: E16/e/src/e16-ecore_list.c =================================================================== --- E16/e/src/e16-ecore_list.c (revision 51690) +++ E16/e/src/e16-ecore_list.c (working copy) @@ -144,7 +144,7 @@ EAPI int ecore_list_empty_is(Ecore_List * list) { - return (list && list->nodes) ? FALSE : TRUE; + return ((list) && (list->nodes)) ? FALSE : TRUE; } /** @@ -444,7 +444,7 @@ if (list->first == old) list->first = NULL; - for (prev = list->first; prev && prev->next != old; prev = prev->next) + for (prev = list->first; (prev) && (prev->next != old); prev = prev->next) ; list->last = prev; if (prev) @@ -481,12 +481,12 @@ if (ecore_list_empty_is(list)) return NULL; - if (indx > ecore_list_count(list) || indx < 0) + if ((indx > ecore_list_count(list)) || (indx < 0)) return NULL; ecore_list_first_goto(list); - for (i = 0; i < indx && ecore_list_next(list); i++) + for (i = 0; (i < indx) && (ecore_list_next(list)); i++) ; if (i >= list->nodes) @@ -516,7 +516,7 @@ indx = 0; node = list->first; - while (node && node->data) + while ((node) && (node->data)) { Ecore_List_Node *next; @@ -548,7 +548,7 @@ EAPI void * ecore_list_first_goto(Ecore_List * list) { - if (!list || !list->first) + if ((!list) || (!list->first)) return NULL; list->current = list->first; @@ -566,7 +566,7 @@ EAPI void * ecore_list_last_goto(Ecore_List * list) { - if (!list || !list->last) + if ((!list) || (!list->last)) return NULL; list->current = list->last; @@ -583,7 +583,7 @@ EAPI void * ecore_list_current(Ecore_List * list) { - return (list && list->current) ? list->current->data : NULL; + return ((list) && (list->current)) ? list->current->data : NULL; } /** @@ -599,7 +599,7 @@ Ecore_List_Node *ret; Ecore_List_Node *next; - if (!list || !list->current) + if ((!list) || (!list->current)) return NULL; ret = list->current; @@ -641,7 +641,7 @@ { Ecore_List_Node *node, *next; - if (!list || !function) + if ((!list) || (!function)) return FALSE; for (node = list->first; node; node = next) @@ -666,7 +666,7 @@ { Ecore_List_Node *node, *next; - if (!list || !function) + if ((!list) || (!function)) return NULL; for (node = list->first; node; node = next) @@ -711,7 +711,7 @@ EAPI int _ecore_list_node_destroy(Ecore_List_Node * node, Ecore_Free_Cb free_func) { - if (free_func && node->data) + if ((free_func) && (node->data)) free_func(node->data); free(node); Index: E16/e/src/text.c =================================================================== --- E16/e/src/text.c (revision 51690) +++ E16/e/src/text.c (working copy) @@ -343,7 +343,7 @@ wchar_t *wc_line = NULL; int wc_len; - if (EwcOpen(ts->need_utf8 || Mode.locale.utf8_int)) + if (EwcOpen((ts->need_utf8) || (Mode.locale.utf8_int))) return; len = strlen(text); @@ -565,7 +565,7 @@ if (len == 0) len = strlen(text); - if (fdc->font->min_byte1 == 0 && fdc->font->max_byte1 == 0) + if ((fdc->font->min_byte1 == 0) && (fdc->font->max_byte1 == 0)) *width = XTextWidth(fdc->font, text, len); else *width = XTextWidth16(fdc->font, (XChar2b *) text, len / 2); @@ -578,7 +578,7 @@ { FontCtxXfont *fdc = (FontCtxXfont *) ts->fdc; - if (fdc->font->min_byte1 == 0 && fdc->font->max_byte1 == 0) + if ((fdc->font->min_byte1 == 0) && (fdc->font->max_byte1 == 0)) XDrawString(disp, fdc->draw, fdc->gc, x, y, text, len); else XDrawString16(disp, fdc->draw, fdc->gc, x, y, (XChar2b *) text, len); @@ -620,7 +620,7 @@ { FontCtxXfont *fdc = (FontCtxXfont *) ts->fdc; - if (fdc->font->min_byte1 == 0 && fdc->font->max_byte1 == 0) + if ((fdc->font->min_byte1 == 0) && (fdc->font->max_byte1 == 0)) TextstateTextFit1(ts, ptext, pw, textwidth_limit); else TextstateTextFit2(ts, ptext, pw, textwidth_limit); @@ -732,7 +732,7 @@ } #endif s = strchr(ts->fontname, ':'); - if (!s || s == ts->fontname) + if ((!s) || (s == ts->fontname)) goto fallback; if (s - ts->fontname > 16) goto fallback; @@ -822,7 +822,7 @@ void TextstateTextFit(TextState * ts, char **ptext, int *pw, int textwidth_limit) { - if (ts->need_utf8 || MB_CUR_MAX > 1) + if ((ts->need_utf8) || (MB_CUR_MAX > 1)) TextstateTextFitMB(ts, ptext, pw, textwidth_limit); else TextstateTextFit1(ts, ptext, pw, textwidth_limit); @@ -840,7 +840,7 @@ int xx, yy, ww, hh, ascent; Pixmap drawable; - if (w <= 0 || h <= 0) + if ((w <= 0) || (h <= 0)) return; TextStateLoadFont(ts); @@ -857,8 +857,8 @@ if (draw == None) draw = WinGetXwin(win); - if (ts->style.orientation == FONT_TO_RIGHT || - ts->style.orientation == FONT_TO_LEFT) + if ((ts->style.orientation == FONT_TO_RIGHT) || + (ts->style.orientation == FONT_TO_LEFT)) { if (pad) { @@ -904,7 +904,7 @@ if (ww > textwidth_limit) ts->ops->TextFit(ts, &lines[i], &ww, textwidth_limit); - if (justv && num_lines == 1 && textheight_limit > 0) + if ((justv) && (num_lines == 1) && (textheight_limit > 0)) yy += (textheight_limit - hh) / 2; if (i == 0) yy += ascent; @@ -937,7 +937,7 @@ if (ww > textwidth_limit) ts->ops->TextFit(ts, &lines[i], &ww, textwidth_limit); - if (justv && num_lines == 1 && textheight_limit > 0) + if ((justv) && (num_lines == 1) && (textheight_limit > 0)) yy += (textheight_limit - hh) / 2; if (i == 0) yy += ascent; @@ -988,7 +988,7 @@ { TextState *ts; - if (!tclass || !text) + if ((!tclass) || (!text)) return; ts = TextclassGetTextState(tclass, state, active, sticky); Index: E16/e/src/ewins.c =================================================================== --- E16/e/src/ewins.c (revision 51690) +++ E16/e/src/ewins.c (working copy) @@ -330,7 +330,7 @@ { EwinStateUpdate(ewin); - if (!EwinIsInternal(ewin) && Mode.wm.startup) + if ((!EwinIsInternal(ewin)) && (Mode.wm.startup)) EHintsGetInfo(ewin); /* E restart hints */ EwinHintsInferProps(ewin); SnapshotEwinApply(ewin); /* Apply saved settings */ @@ -355,7 +355,7 @@ EwinUpdateOpacity(ewin); if ((ewin->border) && (!strcmp(ewin->border->name, "BORDERLESS")) && - EoGetWin(ewin)->argb) + (EoGetWin(ewin)->argb)) EoSetShadow(ewin, 0); HintsSetWindowState(ewin); @@ -505,7 +505,7 @@ w = EoGetW(ewin); h = EoGetH(ewin); if ((px >= x) && (py >= y) && (px < (x + w)) && (py < (y + h)) && - EwinIsMapped(ewin)) + (EwinIsMapped(ewin))) return ewin; } @@ -540,7 +540,7 @@ void SetContextEwin(EWin * ewin) { - if (ewin && ewin->type == EWIN_TYPE_MENU) + if ((ewin) && (ewin->type == EWIN_TYPE_MENU)) return; #if 0 Eprintf("SetContextEwin %#lx %s\n", EwinGetClientXwin(ewin), @@ -654,31 +654,31 @@ EwinStateUpdate(EWin * ewin) { ewin->state.inhibit_actions = ewin->props.no_actions; - ewin->state.inhibit_focus = !ewin->icccm.need_input || - EwinInhGetWM(ewin, focus) || ewin->state.iconified; + ewin->state.inhibit_focus = (!ewin->icccm.need_input) || + (EwinInhGetWM(ewin, focus)) || (ewin->state.iconified); ewin->state.inhibit_move = - EwinInhGetUser(ewin, move) || ewin->state.fullscreen; - ewin->state.inhibit_resize = ewin->state.iconified || ewin->state.shaded || - (ewin->props.no_resize_h && ewin->props.no_resize_v) || - EwinInhGetUser(ewin, size) || ewin->state.fullscreen; + (EwinInhGetUser(ewin, move)) || (ewin->state.fullscreen); + ewin->state.inhibit_resize = (ewin->state.iconified) || (ewin->state.shaded) || + ((ewin->props.no_resize_h) && (ewin->props.no_resize_v)) || + (EwinInhGetUser(ewin, size)) || (ewin->state.fullscreen); ewin->state.inhibit_iconify = EwinInhGetWM(ewin, iconify); - ewin->state.inhibit_shade = ewin->state.no_border || - ewin->state.iconified || ewin->state.fullscreen; + ewin->state.inhibit_shade = (ewin->state.no_border) || + (ewin->state.iconified) || (ewin->state.fullscreen); ewin->state.inhibit_stick = 0; - ewin->state.inhibit_max_hor = ewin->state.inhibit_resize || - ewin->props.no_resize_h || ewin->state.fullscreen; - ewin->state.inhibit_max_ver = ewin->state.inhibit_resize || - ewin->props.no_resize_v || ewin->state.fullscreen; + ewin->state.inhibit_max_hor = (ewin->state.inhibit_resize) || + (ewin->props.no_resize_h) || (ewin->state.fullscreen); + ewin->state.inhibit_max_ver = (ewin->state.inhibit_resize) || + (ewin->props.no_resize_v) || (ewin->state.fullscreen); ewin->state.inhibit_fullscreeen = - ewin->state.inhibit_move || ewin->state.inhibit_resize; + (ewin->state.inhibit_move) || (ewin->state.inhibit_resize); ewin->state.inhibit_change_desk = ewin->state.iconified; - ewin->state.inhibit_close = EwinInhGetApp(ewin, close) || - EwinInhGetUser(ewin, close); + ewin->state.inhibit_close = (EwinInhGetApp(ewin, close)) || + (EwinInhGetUser(ewin, close)); - ewin->state.donthide = ewin->props.donthide || - ewin->props.skip_ext_task || ewin->props.skip_winlist || - ewin->props.skip_focuslist; + ewin->state.donthide = (ewin->props.donthide) || + (ewin->props.skip_ext_task) || (ewin->props.skip_winlist) || + (ewin->props.skip_focuslist); SnapshotEwinUpdate(ewin, SNAP_USE_FLAGS); } @@ -720,14 +720,14 @@ dsk = EoGetDesk(ewin); /* if is an afterstep/windowmaker dock app - dock it */ - if (Conf.dock.enable && ewin->state.docked) + if ((Conf.dock.enable) && (ewin->state.docked)) DockIt(ewin); ewin2 = NULL; if (ewin->icccm.transient) { - if (ewin->icccm.transient_for == None || - ewin->icccm.transient_for == WinGetXwin(VROOT)) + if ((ewin->icccm.transient_for == None) || + (ewin->icccm.transient_for == WinGetXwin(VROOT))) { /* Group transient */ ewin->icccm.transient_for = WinGetXwin(VROOT); @@ -773,7 +773,7 @@ x = EoGetX(ewin); y = EoGetY(ewin); - if (ewin->icccm.transient && Conf.focus.transientsfollowleader) + if ((ewin->icccm.transient) && (Conf.focus.transientsfollowleader)) { EWin *const *lst2; @@ -797,8 +797,8 @@ if (ewin2) { dsk = EoGetDesk(ewin2); - if (!Mode.wm.startup && Conf.focus.switchfortransientmap && - !ewin->state.iconified) + if ((!Mode.wm.startup) && (Conf.focus.switchfortransientmap) && + (!ewin->state.iconified)) DeskGotoByEwin(ewin2); } } @@ -812,8 +812,8 @@ goto done; } - if (!ewin->state.identified && - (ewin->state.maximized_horz || ewin->state.maximized_vert)) + if ((!ewin->state.identified) && + ((ewin->state.maximized_horz) || (ewin->state.maximized_vert))) { int hor, ver; @@ -838,12 +838,12 @@ if (Mode.place.enable_features > 0) { /* if set for borderless then dont slide it in */ - if (Conf.place.slidein && !Mode.place.doing_slide && - !ewin->state.no_border && dsk == DesksGetCurrent()) + if ((Conf.place.slidein) && (!Mode.place.doing_slide) && + (!ewin->state.no_border) && (dsk == DesksGetCurrent())) doslide = 1; - if (Conf.place.manual && !Mode.place.doing_manual && - !ewin->state.placed && !ewin->icccm.transient) + if ((Conf.place.manual) && (!Mode.place.doing_manual) && + (!ewin->state.placed) && (!ewin->icccm.transient)) { if (GrabPointerSet(VROOT, ECSR_GRAB, 0) == GrabSuccess) manplace = 1; @@ -992,7 +992,7 @@ ewin->data = ptr; ewin->ops = ops; - if (ops && ops->Init) + if ((ops) && (ops->Init)) ops->Init(ewin); /* Type specific initialisation */ if (bname) @@ -1168,8 +1168,8 @@ Eprintf("EwinEventUnmap %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetTitle(ewin)); - if (ewin->state.state == EWIN_STATE_STARTUP || - ewin->state.state == EWIN_STATE_NEW) + if ((ewin->state.state == EWIN_STATE_STARTUP) || + (ewin->state.state == EWIN_STATE_NEW)) { #if 0 /* We get here after reparenting to container and occasionally in @@ -1356,7 +1356,7 @@ Eprintf("EwinEventShapeChange %#lx %s: state.shaped=%d ev->shaped=%d\n", EwinGetClientXwin(ewin), EoGetName(ewin), ewin->state.shaped, se->shaped); - if (!se->shaped && !ewin->state.shaped) + if ((!se->shaped) && (!ewin->state.shaped)) return; EwinUpdateShapeInfo(ewin); ewin->update.shape = 1; @@ -1479,7 +1479,7 @@ void EwinHide(EWin * ewin) { - if (!EwinIsInternal(ewin) && (!EoIsShown(ewin) || !EwinIsMapped(ewin))) + if ((!EwinIsInternal(ewin)) && ((!EoIsShown(ewin)) || (!EwinIsMapped(ewin)))) return; EwinUnmap1(ewin); @@ -1491,7 +1491,7 @@ EwinStateUpdate(ewin); - if (!EwinIsInternal(ewin) || ewin->state.iconified) + if ((!EwinIsInternal(ewin)) || (ewin->state.iconified)) return; if (EwinGetClientWin(ewin)) @@ -1500,7 +1500,7 @@ XShapeSelectInput(disp, EwinGetClientXwin(ewin), NoEventMask); } - if (ewin->ops && ewin->ops->Close) + if ((ewin->ops) && (ewin->ops->Close)) ewin->ops->Close(ewin); EwinDestroy(ewin); @@ -1556,7 +1556,7 @@ goto done; done: - return (name && name[0]) ? name : NULL; + return ((name) && (name[0])) ? name : NULL; } const char * @@ -1574,7 +1574,7 @@ return EwinGetTitle(ewin); done: - return (name && strlen(name)) ? name : NULL; + return ((name) && (strlen(name))) ? name : NULL; } const char * @@ -1621,7 +1621,7 @@ w = EoGetW(ewin); h = EoGetH(ewin); - if (x + w <= 0 || x >= WinGetW(VROOT) || y + h <= 0 || y >= WinGetH(VROOT)) + if ((x + w <= 0) || (x >= WinGetW(VROOT)) || (y + h <= 0) || (y >= WinGetH(VROOT))) return 0; return 1; @@ -1776,7 +1776,7 @@ xn = wdn - w - ewin->place.gx; break; } - if (x > 0 && xn < 0) + if ((x > 0) && (xn < 0)) xn = x; switch (ewin->place.gravity) @@ -1791,7 +1791,7 @@ yn = hdn - h - ewin->place.gy; break; } - if (y > 0 && yn < 0) + if ((y > 0) && (yn < 0)) yn = y; #if 0 /* Debug */ @@ -1807,7 +1807,7 @@ void EwinWarpTo(EWin * ewin, int force) { - if (!force && ewin == Mode.mouse_over_ewin) + if ((!force) && (ewin == Mode.mouse_over_ewin)) return; if (ewin->state.iconified) @@ -1896,7 +1896,7 @@ unsigned int opacity; opacity = 0; - if (ewin->state.moving || ewin->state.resizing) + if ((ewin->state.moving) || (ewin->state.resizing)) opacity = OpacityFromPercent(Conf.opacity.movres); else if (ewin->state.active) opacity = ewin->props.focused_opacity; @@ -1973,7 +1973,7 @@ desk = EoGetDesk(ewin); pdesk = EWinChanges.desk; - if (desk != pdesk && !EoIsSticky(ewin)) + if ((desk != pdesk) && (!EoIsSticky(ewin))) { EoSetDesk(ewin, pdesk); EwinMoveToDesktop(ewin, desk); @@ -2044,8 +2044,8 @@ if (ew == ewin) continue; - if (EwinGetTransientFor(ew) == WinGetXwin(VROOT) && - EwinGetWindowGroup(ew) == EwinGetWindowGroup(ewin)) + if ((EwinGetTransientFor(ew) == WinGetXwin(VROOT)) && + (EwinGetWindowGroup(ew) == EwinGetWindowGroup(ewin))) { lst = EREALLOC(EWin *, lst, j + 1); lst[j++] = ew; @@ -2080,9 +2080,9 @@ /* Regular parent or if root trans, top level group members */ if ((EwinGetTransientFor(ewin) == EwinGetClientXwin(ew)) || - (!EwinIsTransient(ew) && - EwinGetTransientFor(ewin) == WinGetXwin(VROOT) && - EwinGetWindowGroup(ew) == EwinGetWindowGroup(ewin))) + ((!EwinIsTransient(ew)) && + (EwinGetTransientFor(ewin) == WinGetXwin(VROOT)) && + (EwinGetWindowGroup(ew) == EwinGetWindowGroup(ewin)))) { lst = EREALLOC(EWin *, lst, j + 1); lst[j++] = ew; @@ -2108,7 +2108,7 @@ for (i = num - 1; i >= 0; i--) { ewin = lst[i]; - if (EwinIsMapped(ewin) && EwinIsOnScreen(ewin)) + if ((EwinIsMapped(ewin)) && (EwinIsOnScreen(ewin))) #if 1 /* FIXME - Which one? */ EwinMove(ewin, EoGetX(ewin), EoGetY(ewin)); #else @@ -2138,7 +2138,7 @@ for (i = 0; i < num; i++) { ewin = lst[num - 1 - i]; - if (!EoIsSticky(ewin) && !EoIsFloating(ewin)) + if ((!EoIsSticky(ewin)) && (!EoIsFloating(ewin))) continue; if (EwinIsTransientChild(ewin)) continue; Index: E16/e/src/finders.c =================================================================== --- E16/e/src/finders.c (revision 51690) +++ E16/e/src/finders.c (working copy) @@ -96,13 +96,13 @@ if (pnum) *pnum = 0; - if (!match || !match[0]) + if ((!match) || (!match[0])) return NULL; ewin = NULL; flags = 0; - if (!strcmp(match, "*") || !strcmp(match, "=") || !strcmp(match, "current")) + if ((!strcmp(match, "*")) || (!strcmp(match, "=")) || (!strcmp(match, "current"))) { ewin = GetContextEwin(); if (!ewin) @@ -234,7 +234,7 @@ gwcnt = 0; gwins = NULL; - if (nogroup || ewin->num_groups <= 0) + if ((nogroup) || (ewin->num_groups <= 0)) goto done; ewins = EwinListGetAll(&num); Index: E16/e/src/eglx.c =================================================================== --- E16/e/src/eglx.c (revision 51690) +++ E16/e/src/eglx.c (working copy) @@ -100,7 +100,7 @@ _glXReleaseTexImageEXT = (glXReleaseTexImageEXT_func) get_func_addr("glXReleaseTexImageEXT"); - return !_glXBindTexImageEXT || !_glXReleaseTexImageEXT; + return !_glXBindTexImageEXT || (!_glXReleaseTexImageEXT); } #endif /* HAVE_GLX_glXBindTexImageEXT */ @@ -186,7 +186,7 @@ continue; D2printf("Checking Visual ID=%#lx depth=%d\n", vi->visualid, vi->depth); - if (vid && vi->visualid != vid) + if ((vid) && (vi->visualid != vid)) continue; #if 1 @@ -387,7 +387,7 @@ Pixmap pixmap; GLXPixmap glxpixmap; - if (xwin == None && draw == None) + if ((xwin == None) && (draw == None)) return 0; pixmap = (draw) ? draw : XCompositeNameWindowPixmap(disp, xwin); @@ -401,7 +401,7 @@ static void _EGlTextureFromDrawable(ETexture * et, Drawable draw, int mode) { - if (!et || draw == None) + if ((!et) || (draw == None)) return; glBindTexture(et->target, et->texture); Index: E16/e/src/cursors.c =================================================================== --- E16/e/src/cursors.c (revision 51690) +++ E16/e/src/cursors.c (working copy) @@ -101,7 +101,7 @@ { ECursor *ec; - if ((!name) || (!image && native_id == -1)) + if ((!name) || ((!image) && (native_id == -1))) return; ec = ECALLOC(ECursor, 1); @@ -165,9 +165,9 @@ XQueryBestCursor(disp, WinGetXwin(VROOT), w, h, &ww, &hh); if ((w <= ww) && (h <= hh) && (pmap)) { - if (xh < 0 || xh >= (int)w) + if ((xh < 0) || (xh >= (int)w)) xh = (int)w / 2; - if (yh < 0 || yh >= (int)h) + if ((yh < 0) || (yh >= (int)h)) yh = (int)h / 2; ec->cursor = ECreatePixmapCursor(pmap, mask, w, h, xh, yh, ec->fg, ec->bg); @@ -210,7 +210,7 @@ static ECursor * ECursorFind(const char *name) { - if (!name || !name[0]) + if ((!name) || (!name[0])) return NULL; return (ECursor *) ecore_list_find(cursor_list, _ECursorMatchName, name); } @@ -334,7 +334,7 @@ ECursor *ec; ec = ECursorAlloc(name); - if (!ec && name2) + if ((!ec) && (name2)) ec = ECursorAlloc(name2); if (ec) return ec->cursor; @@ -369,7 +369,7 @@ Cursor ECsrGet(int which) { - if (which < 0 || which >= ECSR_COUNT) + if ((which < 0) || (which >= ECSR_COUNT)) return None; if (ECsrs[which] == 1) ECsrs[which] = ECursorGetByName(ECData[which].pri, ECData[which].sec, Index: E16/e/src/events.c =================================================================== --- E16/e/src/events.c (revision 51690) +++ E16/e/src/events.c (working copy) @@ -359,8 +359,8 @@ #define XEXT_MASK_CM_ALL ((1 << XEXT_COMPOSITE) | (1 << XEXT_DAMAGE) | \ (1 << XEXT_FIXES) | (1 << XEXT_RENDER)) if (((Mode.server.extensions & XEXT_MASK_CM_ALL) == XEXT_MASK_CM_ALL) && - (ExtData[XEXT_COMPOSITE].major > 0 || - ExtData[XEXT_COMPOSITE].minor >= 2)) + ((ExtData[XEXT_COMPOSITE].major > 0) || + (ExtData[XEXT_COMPOSITE].minor >= 2))) Mode.server.extensions |= 1 << XEXT_CM_ALL; #endif @@ -423,8 +423,8 @@ Mode.events.cy = ry - Mode.wm.win_y; if (Mode.wm.window) { - if (rx < Mode.wm.win_x || rx >= Mode.wm.win_x + Mode.wm.win_w || - ry < Mode.wm.win_y || ry >= Mode.wm.win_y + Mode.wm.win_h) + if ((rx < Mode.wm.win_x) || (rx >= Mode.wm.win_x + Mode.wm.win_w) || + (ry < Mode.wm.win_y) || (ry >= Mode.wm.win_y + Mode.wm.win_h)) Mode.events.on_screen = 0; } } @@ -486,8 +486,8 @@ Mode.context_win = win; Mode.events.time = ev->xcrossing.time; Mode.events.on_screen = ev->xcrossing.same_screen; - if (ev->xcrossing.mode == NotifyGrab && - ev->xcrossing.detail == NotifyInferior) + if ((ev->xcrossing.mode == NotifyGrab) && + (ev->xcrossing.detail == NotifyInferior)) { Mode.grabs.pointer_grab_window = ev->xany.window; if (!Mode.grabs.pointer_grab_active) @@ -500,8 +500,8 @@ case LeaveNotify: Mode.events.time = ev->xcrossing.time; Mode.events.on_screen = ev->xcrossing.same_screen; - if (ev->xcrossing.mode == NotifyGrab && - ev->xcrossing.detail == NotifyInferior) + if ((ev->xcrossing.mode == NotifyGrab) && + (ev->xcrossing.detail == NotifyInferior)) { Mode.grabs.pointer_grab_window = None; Mode.grabs.pointer_grab_active = 0; @@ -533,8 +533,8 @@ Mode.events.double_click = ((ev->xbutton.time - Mode.events.last_btime < DOUBLE_CLICK_TIME) && - ev->xbutton.button == Mode.events.last_button && - ev->xbutton.window == Mode.events.last_bpress2); + (ev->xbutton.button == Mode.events.last_button) && + (ev->xbutton.window == Mode.events.last_bpress2)); Mode.events.last_bpress = ev->xbutton.window; Mode.events.last_bpress2 = ev->xbutton.window; @@ -614,7 +614,7 @@ } } #if ENABLE_DEBUG_EVENTS - if (n && EDebug(EDBUG_TYPE_COMPRESSION)) + if ((n) && (EDebug(EDBUG_TYPE_COMPRESSION))) Eprintf("EventsCompress n=%4d %s %#lx x,y = %d,%d\n", n, EventName(type), ev->xmotion.window, ev->xmotion.x, ev->xmotion.y); @@ -711,8 +711,8 @@ for (j = i - 1; j >= 0; j--) { ev2 = evq + j; - if (ev2->type == type && - ev2->xexpose.window == ev->xexpose.window) + if ((ev2->type == type) && + (ev2->xexpose.window == ev->xexpose.window)) { n++; ev2->type = 0; @@ -745,14 +745,14 @@ for (j = i - 1; j >= 0; j--) { ev2 = evq + j; - if (ev2->type == type && ev2->xany.window == ev->xany.window) + if ((ev2->type == type) && (ev2->xany.window == ev->xany.window)) { n++; ev2->type = 0; } } #if ENABLE_DEBUG_EVENTS - if (n && EDebug(EDBUG_TYPE_COMPRESSION)) + if ((n) && (EDebug(EDBUG_TYPE_COMPRESSION))) Eprintf("EventsCompress n=%4d %s %#lx\n", n, EventName(type), ev->xmotion.window); #endif Index: E16/e/src/sound_pa.c =================================================================== --- E16/e/src/sound_pa.c (revision 51690) +++ E16/e/src/sound_pa.c (working copy) @@ -187,7 +187,7 @@ if (!s) return; - if (pa_ctx && s->name) + if ((pa_ctx) && (s->name)) { op = pa_context_remove_sample(pa_ctx, s->name, context_op_callback, NULL); @@ -269,7 +269,7 @@ pa_operation *op; D2printf("%s beg: %s\n", __func__, s ? s->name : "?"); - if (!pa_ctx || !s) + if ((!pa_ctx) || (!s)) return; op = pa_context_play_sample(pa_ctx, s->name, NULL, PA_VOLUME_NORM, Index: E16/e/src/tooltips.c =================================================================== --- E16/e/src/tooltips.c (revision 51690) +++ E16/e/src/tooltips.c (working copy) @@ -92,7 +92,7 @@ ToolTip *tt; ImageClass *ic; - if (!ic0 || !tclass) + if ((!ic0) || (!tclass)) return NULL; ic = ImageclassAlloc(ic0, 0); @@ -159,7 +159,7 @@ switch (i1) { case CONFIG_CLOSE: - if (iclass[0] && tclass[0] && name[0]) + if ((iclass[0]) && (tclass[0]) && (name[0])) TooltipCreate(name, iclass, bubble1, bubble2, bubble3, bubble4, tclass, distance, tooltiphelppic); @@ -242,7 +242,7 @@ ic = ImageclassFind(ic_name, 0); im = ImageclassGetImage(ic, 0, 0, 0); - if (!ic || !im) + if ((!ic) || (!im)) return; EImageGetSize(im, &w, &h); @@ -269,7 +269,7 @@ const char *tts; EObj *eo; - if (!tt || Mode.mode != MODE_NONE) + if ((!tt) || (Mode.mode != MODE_NONE)) return; if (!tt->TTWIN) @@ -656,7 +656,7 @@ { int i; - if (!tt || !tt->TTWIN || !tt->TTWIN->shown) + if ((!tt) || (!tt->TTWIN) || (!tt->TTWIN->shown)) return; for (i = 4; i >= 0; i--) @@ -726,7 +726,7 @@ goto done; /* In case this is a virtual root */ - if (x < 0 || y < 0 || x >= WinGetW(VROOT) || y >= WinGetH(VROOT)) + if ((x < 0) || (y < 0) || (x >= WinGetW(VROOT)) || (y >= WinGetH(VROOT))) goto done; /* dont pop up tooltip is mouse button down */ @@ -758,7 +758,7 @@ void TooltipsSetPending(int type, CB_GetAclass * func, void *data) { - if (!Mode_tooltips.ac_func && !func) + if ((!Mode_tooltips.ac_func) && (!func)) return; Mode_tooltips.ac_func = func; @@ -787,9 +787,9 @@ if (!func) return; - if (Mode_tooltips.inhibit || !Conf_tooltips.enable) + if ((Mode_tooltips.inhibit) || (!Conf_tooltips.enable)) return; - if (type && !Conf_tooltips.showroottooltip) + if ((type) && (!Conf_tooltips.showroottooltip)) return; TIMER_ADD(tt_timer, 0.001 * Conf_tooltips.delay, ToolTipTimeout, NULL); Index: E16/e/src/groups.c =================================================================== --- E16/e/src/groups.c (revision 51690) +++ E16/e/src/groups.c (working copy) @@ -150,7 +150,7 @@ { int gid; - if (groupid[0] == '*' || groupid[0] == '\0') + if ((groupid[0] == '*') || (groupid[0] == '\0')) return Mode_groups.current; gid = -1; @@ -165,7 +165,7 @@ static void CopyGroupConfig(GroupConfig * src, GroupConfig * dest) { - if (!(src && dest)) + if (!((src) && (dest))) return; memcpy(dest, src, sizeof(GroupConfig)); @@ -180,13 +180,13 @@ Group *g2; Dprintf("ewin=%p group=%p gid=%d\n", ewin, g, g->index); - if (!ewin || !ewin->groups) + if ((!ewin) || (!ewin->groups)) return; for (j = 0; j < ewin->num_groups; j++) { g2 = ewin->groups[j]; - if (g && g != g2) + if ((g) && (g != g2)) continue; for (i = 0; i < g2->num_members; i++) @@ -297,7 +297,7 @@ static void AddEwinToGroup(EWin * ewin, Group * g) { - if (!ewin || !g) + if ((!ewin) || (!g)) return; _GroupAddEwin(g, ewin); @@ -333,7 +333,7 @@ { int i; - if (ewin && g) + if ((ewin) && (g)) { for (i = 0; i < g->num_members; i++) { @@ -349,7 +349,7 @@ { int i; - if (ewin1 && ewin2) + if ((ewin1) && (ewin2)) { for (i = 0; i < ewin1->num_groups; i++) { @@ -365,7 +365,7 @@ { int i, j, k, i2; - if (!ewin || !g) + if ((!ewin) || (!g)) return; for (k = 0; k < ewin->num_groups; k++) @@ -470,7 +470,7 @@ int i, num; const Border *b = NULL; - if (!ewin || group_index >= ewin->num_groups) + if ((!ewin) || (group_index >= ewin->num_groups)) return; if (group_index < 0) @@ -620,7 +620,7 @@ static void ChooseGroup(Dialog * d __UNUSED__, int val, void *data __UNUSED__) { - if (((val == 0) || (val == 2)) && tmp_groups) + if (((val == 0) || (val == 2)) && (tmp_groups)) { ShowHideWinGroups(tmp_ewin, tmp_index, SET_OFF); } @@ -644,7 +644,7 @@ } } } - if (((val == 0) || (val == 2)) && tmp_groups) + if (((val == 0) || (val == 2)) && (tmp_groups)) { Efree(tmp_groups); tmp_groups = NULL; @@ -727,7 +727,7 @@ tmp_group_num = num_groups; if ((num_groups == 0) - && (action == GROUP_OP_BREAK || action == GROUP_OP_DEL)) + && ((action == GROUP_OP_BREAK) || (action == GROUP_OP_DEL))) { DialogOK(_("Window Group Error"), _ @@ -774,10 +774,10 @@ /* Check ewin */ ewin = EwinFindByPtr(dd->ewin); - if (ewin && ewin->num_groups != dd->ngrp) + if ((ewin) && (ewin->num_groups != dd->ngrp)) ewin = NULL; - if (val < 2 && ewin) + if ((val < 2) && (ewin)) { CopyGroupConfig(&(dd->cfg), &(dd->cfgs[dd->current])); for (i = 0; i < ewin->num_groups; i++) @@ -1217,7 +1217,7 @@ else if (!strcmp(param1, "off")) onoff = 0; - if (onoff == -1 && strcmp(param1, "?")) + if ((onoff == -1) && (strcmp(param1, "?"))) { IpcPrintf("Error: unknown mode specified\n"); } @@ -1304,7 +1304,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { /* Show groups */ } Index: E16/e/src/edbus.c =================================================================== --- E16/e/src/edbus.c (revision 51690) +++ E16/e/src/edbus.c (working copy) @@ -112,8 +112,8 @@ DBusMessageIter args; const char *param = ""; - if (!dbus_message_iter_init(msg, &args) || - dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_STRING) + if ((!dbus_message_iter_init(msg, &args)) || + (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_STRING)) { DbusReplyString(conn, msg, "String arg required\n"); return; Index: E16/e/src/snprintf.c =================================================================== --- E16/e/src/snprintf.c (revision 51690) +++ E16/e/src/snprintf.c (working copy) @@ -152,7 +152,7 @@ goto nextch; case '0': /* set zero padding if len not set */ - if (len == 0 && set_precision == 0) + if ((len == 0) && (set_precision == 0)) zpad = '0'; case '1': case '2': @@ -302,7 +302,7 @@ /* cheap strlen so you do not have library call */ for (strlen = 0; (c = value[strlen]); ++strlen) { - if (visible_control && iscntrl(c) && !isspace(c)) + if ((visible_control) && (iscntrl(c)) && (!isspace(c))) { ++strlen; } @@ -321,7 +321,7 @@ /* output characters */ for (i = 0; (c = value[i]); ++i) { - if (visible_control && iscntrl(c) && !isspace(c)) + if ((visible_control) && (iscntrl(c)) && (!isspace(c))) { dopr_outch('^'); c = ('@' | (c & 0x1F)); @@ -379,7 +379,7 @@ padlen = -padlen; /* DEBUGP(( "str '%s', place %d, sign %c, padlen %d\n", * convert,place,signvalue,padlen)); */ - if (zpad && padlen > 0) + if ((zpad) && (padlen > 0)) { if (signvalue) { @@ -457,7 +457,7 @@ static void dopr_outch(int c) { - if (!end || output < end) + if ((!end) || (output < end)) { *output++ = c; } Index: E16/e/src/string.c =================================================================== --- E16/e/src/string.c (revision 51690) +++ E16/e/src/string.c (working copy) @@ -33,7 +33,7 @@ { ch1 = toupper(*s1++); ch2 = toupper(*s2++); - if (ch1 == '\0' || ch1 != ch2) + if ((ch1 == '\0') || (ch1 != ch2)) break; } @@ -60,7 +60,7 @@ ch2 = toupper(*s2++); if (ch2 == '\0') return haystack; - if (ch1 == '\0' || ch1 != ch2) + if ((ch1 == '\0') || (ch1 != ch2)) break; } } Index: E16/e/src/eimage.c =================================================================== --- E16/e/src/eimage.c (revision 51690) +++ E16/e/src/eimage.c (working copy) @@ -180,7 +180,7 @@ { imlib_context_set_image(im); - if (imlib_image_has_alpha() && !_EImageCheckAlpha()) + if ((imlib_image_has_alpha()) && (!_EImageCheckAlpha())) { #if 0 Eprintf("Alpha set but no shape %s\n", is->real_file); @@ -294,7 +294,7 @@ int x, y, tx, ty, ww, hh; int sw, sh; - if (tw <= 0 || th <= 0) + if ((tw <= 0) || (th <= 0)) return; if (flags) @@ -303,7 +303,7 @@ imlib_context_set_image(tile); sw = imlib_image_get_width(); sh = imlib_image_get_height(); - if (sw == tw && sh == th) + if ((sw == tw) && (sh == th)) { tim = tile; } @@ -453,7 +453,7 @@ if (flags) _EImageFlagsSet(flags); - if (w <= 0 || h <= 0) + if ((w <= 0) || (h <= 0)) imlib_render_pixmaps_for_whole_image(pmap, mask); else imlib_render_pixmaps_for_whole_image_at_size(pmap, mask, w, h); @@ -477,7 +477,7 @@ EImageRenderPixmaps(im, win, flags, &pmap, &mask, w, h); ESetWindowBackgroundPixmap(win, pmap); - if ((mask != None) || (mask == None && WinIsShaped(win))) + if ((mask != None) || ((mask == None) && (WinIsShaped(win)))) EShapeSetMask(win, 0, 0, mask); EImagePixmapsFree(pmap, mask); EClearWindow(win); @@ -553,7 +553,7 @@ sw = WinGetW(wsrc); sh = WinGetH(wsrc); EXGetGeometry(src, NULL, NULL, NULL, &stw, &sth, NULL, NULL); - if (stw >= sw && sth >= sh) + if ((stw >= sw) && (sth >= sh)) { ScaleRect(wsrc, src, wdst, dst, 0, 0, sw, sh, dx, dy, dw, dh, scale); return; Index: E16/e/src/coords.c =================================================================== --- E16/e/src/coords.c (revision 51690) +++ E16/e/src/coords.c (working copy) @@ -49,7 +49,7 @@ if (!Conf.movres.mode_info) return; - if (!ewin || !ewin->state.show_coords) + if ((!ewin) || (!ewin->state.show_coords)) return; tc = TextclassFind("COORDS", 1); @@ -84,7 +84,7 @@ /* Width hysteresis (hack - assuming horizontal text) */ cw += 8; - if (eo && abs(EobjGetW(eo) - cw) < 8) + if ((eo) && (abs(EobjGetW(eo) - cw) < 8)) cw = EobjGetW(eo); if (Mode.mode == MODE_MOVE) @@ -130,7 +130,7 @@ cx -= x; cy -= y; #endif - md = cw != EobjGetW(eo) || ch != EobjGetH(eo); /* md is change size flag */ + md = (cw != EobjGetW(eo)) || (ch != EobjGetH(eo)); /* md is change size flag */ EobjMoveResize(eo, cx, cy, cw, ch); if (!eo->shown) @@ -155,7 +155,7 @@ { EObj *eo = coord_eo; - if (eo && eo->shown) + if ((eo) && (eo->shown)) { EobjUnmap(eo); #if TEST_COORD_REPARENT_TO_FRAME Index: E16/e/src/handlers.c =================================================================== --- E16/e/src/handlers.c (revision 51690) +++ E16/e/src/handlers.c (working copy) @@ -139,8 +139,8 @@ for (i = 0; i < sizeof(signals) / sizeof(int); i++) { sig = signals[i]; - if (Mode.wm.coredump && - (sig == SIGILL || sig == SIGFPE || sig == SIGSEGV || sig == SIGBUS)) + if ((Mode.wm.coredump) && + ((sig == SIGILL) || (sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS))) continue; if (setup) Index: E16/e/src/borders.c =================================================================== --- E16/e/src/borders.c (revision 51690) +++ E16/e/src/borders.c (working copy) @@ -100,7 +100,7 @@ if (ebp->flags & FLAG_TITLE) { txt = EwinGetTitle(ewin); - if (txt && ebp->tclass) + if ((txt) && (ebp->tclass)) { ts = TextclassGetTextState(ebp->tclass, ewb->state, ewin->state.active, EoIsSticky(ewin)); @@ -112,7 +112,7 @@ flags |= ITA_BGPMAP; } - if (!force && ewb->is == is && ewb->ts == ts) + if ((!force) && (ewb->is == is) && (ewb->ts == ts)) return; ewb->is = is; ewb->ts = ts; @@ -162,7 +162,7 @@ w -= pad->left + pad->right; h -= pad->top + pad->bottom; } - if (w < 8 || h < 8) + if ((w < 8) || (h < 8)) goto skip_icon; pmap = EGetWindowBackgroundPixmap(ewb->win); EImageRenderOnDrawable(im, ewb->win, pmap, @@ -210,7 +210,7 @@ { BorderWinpartITclassApply(ewin, i, force); - if (ewin->update.shape || ewin->border->changes_shape) + if ((ewin->update.shape) || (ewin->border->changes_shape)) EwinPropagateShapes(ewin); } @@ -226,9 +226,9 @@ #endif for (i = 0; i < ewin->border->num_winparts; i++) - BorderWinpartITclassApply(ewin, i, do_shape || do_paint); + BorderWinpartITclassApply(ewin, i, (do_shape) || (do_paint)); - if (do_shape || ewin->update.shape || ewin->border->changes_shape) + if ((do_shape) || (ewin->update.shape) || (ewin->border->changes_shape)) EwinPropagateShapes(ewin); } @@ -312,7 +312,7 @@ * just a little bit more than the size of the title text. */ - if (max == 0 && ewin->border->part[i].flags & FLAG_TITLE) + if ((max == 0) && (ewin->border->part[i].flags & FLAG_TITLE)) { int dummywidth, wmax, wmin; ImageClass *iclass; @@ -377,7 +377,7 @@ * size to just a little bit more than the size of the title text. */ - if (max == 0 && ewin->border->part[i].flags & FLAG_TITLE) + if ((max == 0) && (ewin->border->part[i].flags & FLAG_TITLE)) { int dummyheight; ImageClass *iclass; @@ -456,7 +456,7 @@ #endif if (reshape) ewin->update.shape = 1; - if (propagate && ewin->update.shape) + if ((propagate) && (ewin->update.shape)) EwinPropagateShapes(ewin); } @@ -491,7 +491,7 @@ /* Quit if we already have a border that isn't an internal one */ b = ewin->border; - if (b && strncmp(b->name, "__", 2)) + if ((b) && (strncmp(b->name, "__", 2))) goto done; b = NULL; @@ -631,8 +631,8 @@ void EwinBorderChange(EWin * ewin, const Border * b, int normal) { - if (!b || ewin->border == b || - ewin->inh_wm.b.border || ewin->state.fullscreen) + if ((!b) || (ewin->border == b) || + (ewin->inh_wm.b.border) || (ewin->state.fullscreen)) return; EwinBorderSetTo(ewin, b); @@ -646,7 +646,7 @@ static void EwinBorderAssign(EWin * ewin, const Border * b) { - if (!b || ewin->border == b || ewin->inh_wm.b.border) + if ((!b) || (ewin->border == b) || (ewin->inh_wm.b.border)) return; if (ewin->border) @@ -932,8 +932,8 @@ /* Beware! Actions may destroy the current border */ wbit->left = 0; - if (ev && WinGetXwin(wbit->win) == Mode.events.last_bpress && !left && - ewin->border->part[part].aclass) + if ((ev) && (WinGetXwin(wbit->win) == Mode.events.last_bpress) && (!left) && + (ewin->border->part[part].aclass)) ActionclassEvent(ewin->border->part[part].aclass, ev, ewin); } @@ -1027,11 +1027,11 @@ ActionclassEvent(ewin->border->aclass, ev, ewin); break; case LeaveNotify: - if (ewin->props.autoshade && !ewin->state.shaded) + if ((ewin->props.autoshade) && (!ewin->state.shaded)) { EQueryPointer(EoGetWin(ewin), &x, &y, NULL, NULL); - if (x >= 4 && x < EoGetW(ewin) - 4 && - y >= 4 && y < EoGetH(ewin) - 4) + if ((x >= 4) && (x < EoGetW(ewin) - 4) && + (y >= 4) && (y < EoGetH(ewin) - 4)) break; TIMER_DEL(ewin->timer); TIMER_ADD(ewin->timer, .5, _BorderAutoshadeTimeout, ewin); @@ -1055,7 +1055,7 @@ return NULL; part = wbit - ewin->bits; - if (part < 0 || part >= ewin->border->num_winparts) + if ((part < 0) || (part >= ewin->border->num_winparts)) return NULL; return ewin->border->part[part].aclass; @@ -1301,7 +1301,7 @@ Border *b; int left, right, top, bottom; - if (w > sw || h > sh) /* Borders must be >= 0 */ + if ((w > sw) || (h > sh)) /* Borders must be >= 0 */ return NULL; b = BorderCreate("__FILLER"); Index: E16/e/src/size.c =================================================================== --- E16/e/src/size.c (revision 51690) +++ E16/e/src/size.c (working copy) @@ -41,12 +41,12 @@ if (!ewin) return; - if (ewin->state.inhibit_max_hor && hor) + if ((ewin->state.inhibit_max_hor) && (hor)) return; - if (ewin->state.inhibit_max_ver && ver) + if ((ewin->state.inhibit_max_ver) && (ver)) return; - if (ewin->state.maximized_horz || ewin->state.maximized_vert) + if ((ewin->state.maximized_horz) || (ewin->state.maximized_vert)) { EwinMoveResize(ewin, ewin->save_max.x, ewin->save_max.y, ewin->save_max.w, ewin->save_max.h); @@ -60,7 +60,7 @@ } type = MAX_ABSOLUTE; /* Select default */ - if (!resize_type || !resize_type[0]) + if ((!resize_type) || (!resize_type[0])) type = Conf.movres.mode_maximize_default; else if (!strcmp(resize_type, "absolute")) type = MAX_ABSOLUTE; @@ -102,7 +102,7 @@ x2 += x1; y2 += y1; - if (Conf.movres.dragbar_nocover && type != MAX_ABSOLUTE) + if ((Conf.movres.dragbar_nocover) && (type != MAX_ABSOLUTE)) { /* Leave room for the dragbar */ switch (Conf.desks.dragdir) @@ -148,13 +148,13 @@ for (i = 0; i < num; i++) { pe = lst[i]; - if (pe == ewin || - pe->state.iconified || EoIsFloating(pe) || - pe->props.ignorearrange || - (EoGetDesk(ewin) != EoGetDesk(pe) && !EoIsSticky(pe)) || + if ((pe == ewin) || + (pe->state.iconified) || (EoIsFloating(pe)) || + (pe->props.ignorearrange) || + ((EoGetDesk(ewin) != EoGetDesk(pe)) && (!EoIsSticky(pe))) || (pe->type & (EWIN_TYPE_DIALOG | EWIN_TYPE_MENU)) || - (type == MAX_AVAILABLE && !pe->props.never_use_area) || - !SPANS_COMMON(x, w, EoGetX(pe), EoGetW(pe))) + ((type == MAX_AVAILABLE) && (!pe->props.never_use_area)) || + (!SPANS_COMMON(x, w, EoGetX(pe), EoGetW(pe)))) continue; if (((EoGetY(pe) + EoGetH(pe)) <= y) @@ -174,13 +174,13 @@ for (i = 0; i < num; i++) { pe = lst[i]; - if (pe == ewin || - pe->state.iconified || EoIsFloating(pe) || - pe->props.ignorearrange || - (EoGetDesk(ewin) != EoGetDesk(pe) && !EoIsSticky(pe)) || + if ((pe == ewin) || + (pe->state.iconified) || (EoIsFloating(pe)) || + (pe->props.ignorearrange) || + ((EoGetDesk(ewin) != EoGetDesk(pe)) && (!EoIsSticky(pe))) || (pe->type & (EWIN_TYPE_DIALOG | EWIN_TYPE_MENU)) || - (type == MAX_AVAILABLE && !pe->props.never_use_area) || - !SPANS_COMMON(y, h, EoGetY(pe), EoGetH(pe))) + ((type == MAX_AVAILABLE) && (!pe->props.never_use_area)) || + (!SPANS_COMMON(y, h, EoGetY(pe), EoGetH(pe)))) continue; if (((EoGetX(pe) + EoGetW(pe)) <= x) Index: E16/e/src/regex.c =================================================================== --- E16/e/src/regex.c (revision 51690) +++ E16/e/src/regex.c (working copy) @@ -69,7 +69,7 @@ l = 0; lenr = 0; match = 1; - if ((strcmp(rx, "*") || rx[0] == 0) && s[0] == 0) + if (((strcmp(rx, "*")) || (rx[0] == 0)) && (s[0] == 0)) return 0; if (rx[0] != '*') Index: E16/e/src/parse.c =================================================================== --- E16/e/src/parse.c (revision 51690) +++ E16/e/src/parse.c (working copy) @@ -54,7 +54,7 @@ case 'S': /* Return pointer to string */ case 'T': /* As S, convert "NULL" to NULL pointer */ chi = *buf; - chq = (chi == '\'' || chi == '"') ? chi : '\0'; + chq = ((chi == '\'') || (chi == '"')) ? chi : '\0'; if (chq) { /* Token is quoted */ @@ -64,7 +64,7 @@ p = strchr(p, chq); if (p) { - if (p[1] && !isspace(p[1])) + if ((p[1]) && (!isspace(p[1]))) continue; *p++ = '\0'; /* Terminate at quote */ } @@ -79,14 +79,14 @@ { /* Token is unquoted */ p = buf + 1; - while (*p && !isspace(*p)) + while ((*p) && (!isspace(*p))) p++; if (*p) *p++ = '\0'; } ps = va_arg(args, char **); - if (chf == 'T' && (!buf[0] || !strcmp(buf, "NULL"))) + if ((chf == 'T') && ((!buf[0]) || (!strcmp(buf, "NULL")))) *ps = NULL; else *ps = buf; Index: E16/e/src/hiwin.c =================================================================== --- E16/e/src/hiwin.c (revision 51690) +++ E16/e/src/hiwin.c (working copy) @@ -81,7 +81,7 @@ /* Skip zoom effect if composite is active */ phi->animate = 0; } - else if (phi->zoom > 2 && EwinIsOnScreen(ewin)) + else if ((phi->zoom > 2) && (EwinIsOnScreen(ewin))) { phi->im = EobjGetImage(EoObj(ewin), EoGetXwin(ewin)); } @@ -326,7 +326,7 @@ if (!phi) return NULL; - if (!check || !phi->ewin) + if ((!check) || (!phi->ewin)) return phi->ewin; ewin = EwinFindByPtr(phi->ewin); @@ -370,7 +370,7 @@ else pz = &HiwinRenderPixmap; - if (phi->zoom <= 2 && zoom == 2) + if ((phi->zoom <= 2) && (zoom == 2)) { phi->zoom = 1; @@ -411,7 +411,7 @@ EoMap(phi, 0); - if (step && phi->animate) + if ((step) && (phi->animate)) { x = phi->xo; y = phi->yo; @@ -449,7 +449,7 @@ pz->draw(phi); on_screen = EQueryPointer(NULL, &px, &py, NULL, NULL); - if (!on_screen || + if ((!on_screen) || (px < x) || (py < y) || (px >= (x + w)) || (py >= (y + h))) { pz->fini(phi, 0); Index: E16/e/src/shapewin.c =================================================================== --- E16/e/src/shapewin.c (revision 51690) +++ E16/e/src/shapewin.c (working copy) @@ -39,7 +39,7 @@ static unsigned int color_value = 0; static unsigned int color_pixel; - if (color_valid && color_value == Conf.movres.color) + if ((color_valid) && (color_value == Conf.movres.color)) goto done; color_value = Conf.movres.color; @@ -91,7 +91,7 @@ sw->mask = ECreatePixmap(EoGetWin(sw), WinGetW(VROOT), WinGetH(VROOT), 1); sw->gc = EXCreateGC(sw->mask, 0, NULL); - if (sw->mask == None || !sw->gc) + if ((sw->mask == None) || (!sw->gc)) goto bail_out; } Index: E16/e/src/focus.c =================================================================== --- E16/e/src/focus.c (revision 51690) +++ E16/e/src/focus.c (working copy) @@ -83,16 +83,16 @@ if (ewin->state.inhibit_focus) return 0; - if (!EwinIsMapped(ewin) || !EoIsShown(ewin)) + if ((!EwinIsMapped(ewin)) || (!EoIsShown(ewin))) return 0; - if (ewin->props.focusclick && !click) + if ((ewin->props.focusclick) && (!click)) return 0; - if (want_visible && ewin->state.visibility == VisibilityFullyObscured) + if ((want_visible) && (ewin->state.visibility == VisibilityFullyObscured)) return 0; - return !want_on_screen || EwinIsOnScreen(ewin); + return (!want_on_screen) || (EwinIsOnScreen(ewin)); } /* @@ -109,13 +109,13 @@ default: case MODE_FOCUS_POINTER: ewin = GetEwinPointerInClient(); - if (ewin && !FocusEwinValid(ewin, 1, 0, 0)) + if ((ewin) && (!FocusEwinValid(ewin, 1, 0, 0))) ewin = NULL; break; case MODE_FOCUS_SLOPPY: ewin = GetEwinPointerInClient(); - if (ewin && FocusEwinValid(ewin, 1, 0, 0)) + if ((ewin) && (FocusEwinValid(ewin, 1, 0, 0))) break; goto do_select; @@ -127,8 +127,8 @@ lst = EwinListFocusGet(&num); for (i = 0; i < num; i++) { - if (!FocusEwinValid(lst[i], 1, 0, 0) || - lst[i]->props.skip_focuslist) + if ((!FocusEwinValid(lst[i], 1, 0, 0)) || + (lst[i]->props.skip_focuslist)) continue; ewin = lst[i]; break; @@ -200,7 +200,7 @@ for (i = 1; i < num; i++) { ewin = lst[(j + i * dir + num) % num]; - if (!FocusEwinValid(ewin, 1, 0, 0) || ewin->props.skip_focuslist) + if ((!FocusEwinValid(ewin, 1, 0, 0)) || (ewin->props.skip_focuslist)) continue; FocusToEWin(ewin, FOCUS_PREV); break; @@ -212,8 +212,8 @@ { int set = 0; - if ((Conf.focus.clickraises && !EwinListStackIsRaised(ewin)) || - (!ewin->state.active && !ewin->state.inhibit_focus)) + if (((Conf.focus.clickraises) && (!EwinListStackIsRaised(ewin))) || + ((!ewin->state.active) && (!ewin->state.inhibit_focus))) set = 1; if (set) @@ -252,7 +252,7 @@ EwinBorderUpdateState(ewin); EwinUpdateOpacity(ewin); - if (active && ewin->state.attention) + if ((active) && (ewin->state.attention)) { ewin->state.attention = 0; HintsSetWindowState(ewin); @@ -308,7 +308,7 @@ case FOCUS_ENTER: case FOCUS_LEAVE: /* Unused */ case FOCUS_CLICK: - if (ewin && ewin == Mode.focuswin) + if ((ewin) && (ewin == Mode.focuswin)) return; if (!ewin) /* Unfocus */ break; @@ -348,7 +348,7 @@ if (ewin->props.focus_when_mapped) goto check_focus_new; - if (Conf.focus.new_windows_get_focus_if_group_focused && Mode.focuswin) + if ((Conf.focus.new_windows_get_focus_if_group_focused) && (Mode.focuswin)) { if (EwinGetWindowGroup(ewin) == EwinGetWindowGroup(Mode.focuswin)) goto check_focus_new; @@ -360,8 +360,8 @@ { do_focus = 1; } - else if (Conf.focus.new_transients_get_focus_if_group_focused && - Mode.focuswin) + else if ((Conf.focus.new_transients_get_focus_if_group_focused) && + (Mode.focuswin)) { if ((EwinGetTransientFor(ewin) == EwinGetClientXwin(Mode.focuswin)) || @@ -384,7 +384,7 @@ break; } - if (ewin == Mode.focuswin && focus_is_set) + if ((ewin == Mode.focuswin) && (focus_is_set)) return; /* Check if ewin is a valid focus window target */ @@ -394,7 +394,7 @@ /* NB! ewin != NULL */ - if (why != FOCUS_CLICK && ewin->props.focusclick) + if ((why != FOCUS_CLICK) && (ewin->props.focusclick)) return; if (Conf.autoraise.enable) @@ -480,7 +480,7 @@ break; default: - if (ewin && !FocusEwinValid(ewin, 0, why == FOCUS_CLICK, 0)) + if ((ewin) && (!FocusEwinValid(ewin, 0, why == FOCUS_CLICK, 0))) break; focus_pending_why = why; focus_pending_ewin = ewin; @@ -506,7 +506,7 @@ static void FocusSet(void) { - if (focus_pending_new && Conf.focus.all_new_windows_get_focus) + if ((focus_pending_new) && (Conf.focus.all_new_windows_get_focus)) doFocusToEwin(focus_pending_new, FOCUS_EWIN_NEW); else doFocusToEwin(focus_pending_ewin, focus_pending_why); @@ -562,7 +562,7 @@ Time t; int x, y; - if (scr < 0 || scr >= ScreenCount(disp)) + if ((scr < 0) || (scr >= ScreenCount(disp))) return; /* IIRC warping to a different screen once did cause @@ -613,8 +613,8 @@ { Mode.mouse_over_ewin = ewin; - if (ev->xcrossing.mode == NotifyUngrab && - ev->xcrossing.detail == NotifyNonlinearVirtual) + if ((ev->xcrossing.mode == NotifyUngrab) && + (ev->xcrossing.detail == NotifyNonlinearVirtual)) return; if ((int)ev->xcrossing.serial - focus_request < 0) @@ -666,8 +666,8 @@ /* Leaving root may mean entering other screen */ if (!ewin) { - if (ev->xcrossing.mode == NotifyNormal && - ev->xcrossing.detail != NotifyInferior) + if ((ev->xcrossing.mode == NotifyNormal) && + (ev->xcrossing.detail != NotifyInferior)) FocusToEWin(NULL, FOCUS_DESK_LEAVE); } } @@ -1008,7 +1008,7 @@ static void _FocusIdler(void *data __UNUSED__) { - if (!focus_inhibit && focus_pending_why) + if ((!focus_inhibit) && (focus_pending_why)) FocusSet(); if (click_pending_update_grabs) doClickGrabsUpdate(); @@ -1051,7 +1051,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { EWin *ewin; Index: E16/e/src/session.c =================================================================== --- E16/e/src/session.c (revision 51690) +++ E16/e/src/session.c (working copy) @@ -187,7 +187,7 @@ restartVal[n++].value = (char *)"-s"; restartVal[n++].value = (char *)bufs; } - else if (restarting && !Mode.wm.master) + else if ((restarting) && (!Mode.wm.master)) { Esnprintf(bufm, sizeof(bufm), "%i", Mode.wm.master_screen); restartVal[n++].value = (char *)"-m"; @@ -480,7 +480,7 @@ SnapshotsSaveReal(NULL); #if USE_SM - if (shutdown && sm_conn) + if ((shutdown) && (sm_conn)) ice_exit(); #endif /* USE_SM */ } @@ -508,7 +508,7 @@ SessionSave(1); - if (mode != EEXIT_THEME && mode != EEXIT_RESTART) + if ((mode != EEXIT_THEME) && (mode != EEXIT_RESTART)) SessionHelper(ESESSION_STOP); LangExit(); @@ -544,7 +544,7 @@ case EEXIT_RESTART: SoundPlay(SOUND_WAIT); #ifdef USE_EXT_INIT_WIN - if (disp && !Mode.wm.window) + if ((disp) && (!Mode.wm.window)) new_init_win_ext = ExtInitWinCreate(); #endif EDisplayClose(); @@ -683,7 +683,7 @@ if (Mode.wm.exiting) return; - if (Mode.wm.startup || Mode.wm.exit_now) + if ((Mode.wm.startup) || (Mode.wm.exit_now)) goto done; switch (mode) @@ -748,15 +748,15 @@ switch (when) { case ESESSION_INIT: - if (Conf.session.enable_script && Conf.session.script) + if ((Conf.session.enable_script) && (Conf.session.script)) SessionRunProg(Conf.session.script, "init"); break; case ESESSION_START: - if (Conf.session.enable_script && Conf.session.script) + if ((Conf.session.enable_script) && (Conf.session.script)) SessionRunProg(Conf.session.script, "start"); break; case ESESSION_STOP: - if (Conf.session.enable_script && Conf.session.script) + if ((Conf.session.enable_script) && (Conf.session.script)) SessionRunProg(Conf.session.script, "stop"); break; } Index: E16/e/src/main.c =================================================================== --- E16/e/src/main.c (revision 51690) +++ E16/e/src/main.c (working copy) @@ -384,7 +384,7 @@ /* Short option */ if (!lopt) { - if (!eopt->sopt || eopt->sopt != s[0]) + if ((!eopt->sopt) || (eopt->sopt != s[0])) continue; if (eopt->arg) { @@ -420,7 +420,7 @@ return '?'; found: - if (!eopt->arg || eoptarg) + if ((!eopt->arg) || (eoptarg)) return eopt->sopt; if (eoptind >= argc - 1) @@ -485,7 +485,7 @@ SessionHelper(ESESSION_START); - if (Mode.firsttime && Mode.wm.master) + if ((Mode.firsttime) && (Mode.wm.master)) { RunMenuGen(); RunDocBrowser(); Index: E16/e/src/windowmatch.c =================================================================== --- E16/e/src/windowmatch.c (revision 51690) +++ E16/e/src/windowmatch.c (working copy) @@ -155,7 +155,7 @@ case CONFIG_CLOSE: if (wm) { - if (!wm->match || !wm->op) + if ((!wm->match) || (!wm->op)) WindowMatchDestroy(wm); wm = NULL; err = 0; @@ -504,18 +504,18 @@ return matchregexp(wm->value, EwinGetIcccmClass(ewin)); case MATCH_TYPE_SIZE: - match = (ewin->client.w >= wm->width_min && - ewin->client.w <= wm->width_max && - ewin->client.h >= wm->height_min && - ewin->client.h <= wm->height_max); + match = ((ewin->client.w >= wm->width_min) && + (ewin->client.w <= wm->width_max) && + (ewin->client.h >= wm->height_min) && + (ewin->client.h <= wm->height_max)); break; case MATCH_TYPE_SIZE_H: - match = (ewin->client.w >= wm->width_min && - ewin->client.w <= wm->width_max); + match = ((ewin->client.w >= wm->width_min) && + (ewin->client.w <= wm->width_max)); break; case MATCH_TYPE_SIZE_V: - match = (ewin->client.h >= wm->height_min && - ewin->client.h <= wm->height_max); + match = ((ewin->client.h >= wm->height_min) && + (ewin->client.h <= wm->height_max)); break; case MATCH_TYPE_PROP: @@ -530,7 +530,7 @@ break; case MATCH_PROP_FIXEDSIZE: - match = ewin->props.no_resize_h && ewin->props.no_resize_v; + match = (ewin->props.no_resize_h) && (ewin->props.no_resize_v); break; case MATCH_PROP_FIXEDSIZE_H: match = ewin->props.no_resize_h; @@ -583,7 +583,7 @@ const WindowMatch *wm = (WindowMatch *) data; const wmatch_type_data *wmtd = (wmatch_type_data *) match; - return !(wm->op == wmtd->type && WindowMatchEwinTest(wm, wmtd->ewin)); + return !((wm->op == wmtd->type) && (WindowMatchEwinTest(wm, wmtd->ewin))); } static WindowMatch * @@ -633,7 +633,7 @@ /* We set off if "0" or "off", otherwise on */ if (!value) return 1; - else if (!strcmp(value, "0") || !strcmp(value, "off")) + else if ((!strcmp(value, "0")) || (!strcmp(value, "off"))) return 0; return 1; } @@ -851,7 +851,7 @@ p += len; wop = EwinOpFind(op); - if (!wop || !wop->ok_match) + if ((!wop) || (!wop->ok_match)) { err = -1; break; @@ -881,7 +881,7 @@ const WindowMatch *wm = (WindowMatch *) _wm; EWin *ew = (EWin *) _ew; - if (wm->op != MATCH_OP_WINOP || !WindowMatchEwinTest(wm, ew)) + if ((wm->op != MATCH_OP_WINOP) || (!WindowMatchEwinTest(wm, ew))) return; /* Match found - do the ops */ @@ -901,7 +901,7 @@ const WindowMatch *wm = (WindowMatch *) _wm; EObj *eo = (EObj *) _eo; - if (wm->op != MATCH_OP_WINOP || !WindowMatchEobjTest(wm, eo)) + if ((wm->op != MATCH_OP_WINOP) || (!WindowMatchEobjTest(wm, eo))) return; /* Match found - do the ops */ @@ -956,7 +956,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { } else if (!strncmp(cmd, "list", 2)) Index: E16/e/src/slideout.c =================================================================== --- E16/e/src/slideout.c (revision 51690) +++ E16/e/src/slideout.c (working copy) @@ -161,8 +161,8 @@ /* If the slideout is associated with an ewin, * put it on the same virtual desktop. */ dsk = EoGetDesk(ewin); - if (BorderWinpartIndex(ewin, win) >= 0 && - !EoIsFloating(ewin) /* && !ewin->sticky */ ) + if ((BorderWinpartIndex(ewin, win) >= 0) && + (!EoIsFloating(ewin)) /* && !ewin->sticky */ ) { xx -= EoGetX(dsk); yy -= EoGetY(dsk); @@ -338,7 +338,7 @@ { EObj *eob = (EObj *) b; - if (!s || !b) + if ((!s) || (!b)) return; s->num_objs++; @@ -456,8 +456,8 @@ break; case ESIGNAL_EWIN_UNMAP: - if (Mode_slideouts.active - && Mode_slideouts.active->context_ewin == (EWin *) prm) + if ((Mode_slideouts.active) + && (Mode_slideouts.active->context_ewin == (EWin *) prm)) SlideoutsHide(); break; } Index: E16/e/src/tclass.c =================================================================== --- E16/e/src/tclass.c (revision 51690) +++ E16/e/src/tclass.c (working copy) @@ -148,7 +148,7 @@ { TextClass *tc; - if (!name || !name[0]) + if ((!name) || (!name[0])) return NULL; tc = TextclassFind(name, fallback); @@ -183,7 +183,7 @@ static void TextclassPopulate(TextClass * tc) { - if (!tc || !tc->norm.normal) + if ((!tc) || (!tc->norm.normal)) return; TSTATE_SET_STATE(norm.hilited, norm.normal); @@ -220,7 +220,7 @@ if (name) tc = (TextClass *) ecore_list_find(tclass_list, _TextclassMatchName, name); - if (tc || !fallback) + if ((tc) || (!fallback)) return tc; #if 0 Index: E16/e/src/misc.c =================================================================== --- E16/e/src/misc.c (revision 51690) +++ E16/e/src/misc.c (working copy) @@ -112,7 +112,7 @@ { float x, l; - if (k >= k2 || mode == 0) + if ((k >= k2) || (mode == 0)) return k; l = k2 - k1; @@ -280,7 +280,7 @@ int EDebug(unsigned int type) { - return (ev_debug && + return ((ev_debug) && (type < sizeof(ev_debug_flags))) ? ev_debug_flags[type] : 0; } Index: E16/e/src/ewmh.c =================================================================== --- E16/e/src/ewmh.c (revision 51690) +++ E16/e/src/ewmh.c (working copy) @@ -75,14 +75,14 @@ break; in_list = i < n; - if (set && !in_list) + if ((set) && (!in_list)) { /* Add it (if space left) */ if (n < size) atoms[n++] = atom; *count = n; } - else if (!set && in_list) + else if ((!set) && (in_list)) { /* Remove it */ atoms[i] = atoms[--n]; @@ -400,7 +400,7 @@ ECORE_X_ATOM_NET_WM_STATE_SKIP_TASKBAR, ewin->props.skip_ext_task); atom_list_set(atom_list, len, &atom_count, ECORE_X_ATOM_NET_WM_STATE_HIDDEN, - ewin->state.iconified || ewin->state.shaded); + (ewin->state.iconified) || (ewin->state.shaded)); atom_list_set(atom_list, len, &atom_count, ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT, ewin->state.maximized_vert); @@ -625,7 +625,7 @@ if (num <= 0) return; - if (num < 2 || num < (int)(2 + val[0] * val[1])) + if ((num < 2) || (num < (int)(2 + val[0] * val[1]))) { Eprintf ("*** EWMH_GetWindowIcons Icon data/size mismatch (ignoring): %s: N=%d WxH=%dx%d\n", @@ -666,9 +666,9 @@ return; ecore_x_netwm_startup_id_get(EwinGetClientXwin(ewin), &str); - if (!str && TryGroup(ewin)) + if ((!str) && (TryGroup(ewin))) ecore_x_netwm_startup_id_get(ewin->icccm.group, &str); - if (str && EDebug(1)) + if ((str) && (EDebug(1))) Eprintf("Startup id: %s: %s\n", EwinGetTitle(ewin), str); Efree(str); /* Well... just free for now */ @@ -820,8 +820,8 @@ EWMH_GetWindowIconName(ewin); return 1; } - if (atom_change == ECORE_X_ATOM_NET_WM_STRUT_PARTIAL || - atom_change == ECORE_X_ATOM_NET_WM_STRUT) + if ((atom_change == ECORE_X_ATOM_NET_WM_STRUT_PARTIAL) || + (atom_change == ECORE_X_ATOM_NET_WM_STRUT)) { EWMH_GetWindowStrut(ewin); return 1; @@ -940,15 +940,15 @@ ewin->props.skip_ext_pager = action; EWMH_SetWindowState(ewin); } - else if (atom == ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT || - atom == ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ) + else if ((atom == ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT) || + (atom == ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ)) { int maxh, maxv; maxh = ewin->state.maximized_horz; maxv = ewin->state.maximized_vert; - if (atom2 == ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT || - atom2 == ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ) + if ((atom2 == ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT) || + (atom2 == ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ)) { /* (ok - ok) */ maxh = do_set(maxh, action); Index: E16/e/src/stacking.c =================================================================== --- E16/e/src/stacking.c (revision 51690) +++ E16/e/src/stacking.c (working copy) @@ -172,7 +172,7 @@ { /* Take the layer into account */ for (; j >= 0; j--) - if (i != j && eo->ilayer <= ewl->list[j]->ilayer) + if ((i != j) && (eo->ilayer <= ewl->list[j]->ilayer)) break; if (j < i) j++; @@ -186,14 +186,14 @@ { memmove(ewl->list + i, ewl->list + i + 1, n * sizeof(EObj *)); ewl->list[j] = eo; - if (ewl->layered && eo->stacked > 0) + if ((ewl->layered) && (eo->stacked > 0)) DeskSetDirtyStack(eo->desk, eo); } else if (n < 0) { memmove(ewl->list + j + 1, ewl->list + j, -n * sizeof(EObj *)); ewl->list[j] = eo; - if (ewl->layered && eo->stacked > 0) + if ((ewl->layered) && (eo->stacked > 0)) DeskSetDirtyStack(eo->desk, eo); } @@ -216,7 +216,7 @@ { /* Take the layer into account */ for (; j < ewl->nwins; j++) - if (j != i && eo->ilayer >= ewl->list[j]->ilayer) + if ((j != i) && (eo->ilayer >= ewl->list[j]->ilayer)) break; if (j > i) j--; @@ -230,14 +230,14 @@ { memmove(ewl->list + i, ewl->list + i + 1, n * sizeof(EObj *)); ewl->list[j] = eo; - if (ewl->layered && eo->stacked > 0) + if ((ewl->layered) && (eo->stacked > 0)) DeskSetDirtyStack(eo->desk, eo); } else if (n < 0) { memmove(ewl->list + j + 1, ewl->list + j, -n * sizeof(EObj *)); ewl->list[j] = eo; - if (ewl->layered && eo->stacked > 0) + if ((ewl->layered) && (eo->stacked > 0)) DeskSetDirtyStack(eo->desk, eo); } @@ -400,7 +400,7 @@ for (i = j = 0; i < ewl->nwins; i++) { eo = ewl->list[i]; - if (eo->type != EOBJ_TYPE_EWIN || eo->desk != dsk) + if ((eo->type != EOBJ_TYPE_EWIN) || (eo->desk != dsk)) continue; lst[j++] = (EWin *) eo; Index: E16/e/src/config.c =================================================================== --- E16/e/src/config.c (revision 51690) +++ E16/e/src/config.c (working copy) @@ -108,7 +108,7 @@ si = NULL; break; case ';': /* Line separator */ - if (escape || quote) + if ((escape) || (quote)) goto case_char; /* FALLTHROUGH */ case '\n': @@ -165,7 +165,7 @@ for (; so > s; so--) { ch = so[-1]; - if (ch != ' ' && ch != '\t') + if ((ch != ' ') && (ch != '\t')) break; } if (so != si) @@ -195,7 +195,7 @@ { i1 = CONFIG_INVALID; } - else if (i1 == CONFIG_CLOSE || i1 == CONFIG_NEXT) + else if ((i1 == CONFIG_CLOSE) || (i1 == CONFIG_NEXT)) { if (fields != 1) { @@ -541,7 +541,7 @@ Esnprintf(s, sizeof(s), "%s/cached/cfg/%s.preparsed", EDirUserCache(), file); ppfile = Estrdup(s); - if (exists(s) && moddate(s) > moddate(fullname)) + if ((exists(s)) && (moddate(s) > moddate(fullname))) goto done; /* No preparesd file or source is newer. Do preparsing. */ @@ -615,7 +615,7 @@ for (i = 0; i < (int)(sizeof(config_files) / sizeof(char *)); i++) { - if (!Mode.wm.restart && Conf.startup.animate) + if ((!Mode.wm.restart) && (Conf.startup.animate)) { if (i == 2) StartupWindowsCreate(); Index: E16/e/src/icons.c =================================================================== --- E16/e/src/icons.c (revision 51690) +++ E16/e/src/icons.c (working copy) @@ -59,7 +59,7 @@ } if (sj > sz) { - if (sbest > sz && sj >= sbest) + if ((sbest > sz) && (sj >= sbest)) continue; } else @@ -91,7 +91,7 @@ w = 4; if (h < 4) h = 4; - if (w > ww || h > hh) + if ((w > ww) || (h > hh)) { w = ww; h = hh; @@ -122,7 +122,7 @@ ww = EoGetW(ewin); hh = EoGetH(ewin); - if (ww <= 0 || hh <= 0) + if ((ww <= 0) || (hh <= 0)) return NULL; /* Oversample for nicer snapshots */ @@ -183,7 +183,7 @@ h = 0; EXGetGeometry(ewin->icccm.icon_pmap, NULL, NULL, NULL, &w, &h, NULL, NULL); - if (w < 1 || h < 1) + if ((w < 1) || (h < 1)) return NULL; im = EImageGrabDrawable(ewin->icccm.icon_pmap, ewin->icccm.icon_mask, @@ -252,7 +252,7 @@ EImage *im = NULL; int i, type; - if (mode < 0 || mode >= N_MODES) + if ((mode < 0) || (mode >= N_MODES)) mode = 1; for (i = 0; i < N_TYPES; i++) Index: E16/e/src/glwin.c =================================================================== --- E16/e/src/glwin.c (revision 51690) +++ E16/e/src/glwin.c (working copy) @@ -419,7 +419,7 @@ ewin = ewins[i]; if (!EoIsShown(ewin)) continue; - if (ewin->props.skip_focuslist || ewin->props.skip_ext_task) + if ((ewin->props.skip_focuslist) || (ewin->props.skip_ext_task)) continue; lst[j++] = ewin; } Index: E16/e/src/fonts.c =================================================================== --- E16/e/src/fonts.c (revision 51690) +++ E16/e/src/fonts.c (working copy) @@ -105,7 +105,7 @@ name = font = NULL; parse(s, "%S%S", &name, &font); - if (!name || !font) + if ((!name) || (!font)) continue; if (strncmp(name, "font-", 5)) @@ -130,7 +130,7 @@ FontConfigLoad(void) { /* First check explicitly specified configuration (not in theme dir) */ - if (Conf.theme.use_alt_font_cfg && Conf.theme.font_cfg) + if ((Conf.theme.use_alt_font_cfg) && (Conf.theme.font_cfg)) { if (!_FontConfigLoad1(Conf.theme.font_cfg, 0)) return; Index: E16/e/src/emodule.c =================================================================== --- E16/e/src/emodule.c (revision 51690) +++ E16/e/src/emodule.c (working copy) @@ -41,8 +41,8 @@ for (i = 0; i < n_modules; i++) { pm = p_modules[i]; - if (!strncmp(name, pm->name, 4) || - (pm->nick && !strcmp(name, pm->nick))) + if ((!strncmp(name, pm->name, 4)) || + ((pm->nick) && (!strcmp(name, pm->nick)))) return pm; } return NULL; Index: E16/e/src/draw.c =================================================================== --- E16/e/src/draw.c (revision 51690) +++ E16/e/src/draw.c (working copy) @@ -188,7 +188,7 @@ { static ShapeWin *shape_win = NULL; - if (firstlast == 0 && !shape_win) + if ((firstlast == 0) && (!shape_win)) shape_win = ShapewinCreate(md); if (!shape_win) return; @@ -234,7 +234,7 @@ psd->gc = EXCreateGC(psd->root, GCFunction | GCForeground | GCSubwindowMode, &gcv); #if ENABLE_MODE_34 - if (md == 3 || md == 4) + if ((md == 3) || (md == 4)) { if (!b2) b2 = XCreateBitmapFromData(disp, psd->root, gray_bits, @@ -394,9 +394,9 @@ int dx, dy; /* Quit if no change */ - if (firstlast == 1 && - (x == ewin->shape_x && y == ewin->shape_y && - (ewin->state.shaded || (w == ewin->shape_w && h == ewin->shape_h)))) + if ((firstlast == 1) && + ((x == ewin->shape_x) && (y == ewin->shape_y) && + ((ewin->state.shaded) || ((w == ewin->shape_w) && (h == ewin->shape_h))))) return; if (md == 0) @@ -435,7 +435,7 @@ EwinBorderGetSize(ewin, &psd->bl, &psd->br, &psd->bt, &psd->bb); - if (md <= 2 && Conf.movres.avoid_server_grab) + if ((md <= 2) && (Conf.movres.avoid_server_grab)) { _ShapeDrawNograb1_2(psd, md, firstlast, x, y, w, h, seqno); goto done; @@ -469,7 +469,7 @@ psd->ho = h; done: - if (firstlast == 0 || firstlast == 2 || firstlast == 4) + if ((firstlast == 0) || (firstlast == 2) || (firstlast == 4)) { ewin->req_x = ewin->shape_x; ewin->req_y = ewin->shape_y; Index: E16/e/src/settings.c =================================================================== --- E16/e/src/settings.c (revision 51690) +++ E16/e/src/settings.c (working copy) @@ -787,7 +787,7 @@ unsigned int i; const char *name; - if (!params || !params[0]) + if ((!params) || (!params[0])) { DialogShowSimple(&DlgConfiguration, NULL); return; Index: E16/e/src/memory.c =================================================================== --- E16/e/src/memory.c (revision 51690) +++ E16/e/src/memory.c (working copy) @@ -96,9 +96,9 @@ s = EREALLOC(char, ss, len + l1 + l2 + 1); if (!s) return NULL; - if (s1 && l1) + if ((s1) && (l1)) memcpy(s + len, s1, l1); - if (s2 && l2) + if ((s2) && (l2)) memcpy(s + len + l1, s2, l2); s[len + l1 + l2] = '\0'; @@ -168,7 +168,7 @@ int i, j, ch; char *s, *p; - if (!lst || num <= 0) + if ((!lst) || (num <= 0)) return NULL; j = 0; @@ -189,7 +189,7 @@ if (++j >= num) goto done; p = lst[j]; - if (!p || !p[0]) + if ((!p) || (!p[0])) goto done; *s++ = ' '; break; Index: E16/e/src/warp.c =================================================================== --- E16/e/src/warp.c (revision 51690) +++ E16/e/src/warp.c (working copy) @@ -163,7 +163,7 @@ ss[0] = '\0'; if (Conf.warplist.showalldesks) { - if (EoIsSticky(ewin) || ewin->state.iconified) + if ((EoIsSticky(ewin)) || (ewin->state.iconified)) strcpy(ss, "[-] "); else Esnprintf(ss, sizeof(ss), "[%d] ", EoGetDeskNum(ewin)); @@ -183,8 +183,8 @@ h += pad->top + pad->bottom; if (Conf.warplist.icon_mode != 0) { - if (Conf.warplist.icon_mode != EWIN_ICON_MODE_APP_IMG && - Conf.warplist.icon_mode != EWIN_ICON_MODE_IMG_APP) + if ((Conf.warplist.icon_mode != EWIN_ICON_MODE_APP_IMG) && + (Conf.warplist.icon_mode != EWIN_ICON_MODE_IMG_APP)) Conf.warplist.icon_mode = EWIN_ICON_MODE_APP_IMG; w += h; } @@ -308,7 +308,7 @@ { WarpFocusWin *fw = warpFocusWindow; - if (fw && EoIsShown(fw)) + if ((fw) && (EoIsShown(fw))) WarpFocusWinHide(fw); Efree(warplist); @@ -326,7 +326,7 @@ WarplistItem *wl; /* Remember invoking keycode (ugly hack) */ - if (!fw || !EoIsShown(fw)) + if ((!fw) || (!EoIsShown(fw))) { warpFocusKey = Mode.events.last_keycode; warpFocusState = Mode.events.last_keystate; @@ -360,7 +360,7 @@ } /* Hmmm. Hack... */ - if (warplist_num >= 2 && warplist[1].ewin == GetFocusEwin()) + if ((warplist_num >= 2) && (warplist[1].ewin == GetFocusEwin())) { warplist[1].ewin = warplist[0].ewin; warplist[0].ewin = GetFocusEwin(); @@ -402,7 +402,7 @@ if (!warplist) return; - if (ix < 0 || ix >= warplist_num) + if ((ix < 0) || (ix >= warplist_num)) return; if (ix == warpFocusIndex) return; Index: E16/e/src/systray.c =================================================================== --- E16/e/src/systray.c (revision 51690) +++ E16/e/src/systray.c (working copy) @@ -76,8 +76,8 @@ &num_ret, &bytes_after, &prop_ret) != Success) return -1; - if (prop_ret && type_ret == E_XA__XEMBED_INFO && format_ret == 32 - && num_ret >= 2) + if ((prop_ret) && (type_ret == E_XA__XEMBED_INFO) && (format_ret == 32) + && (num_ret >= 2)) { info[0] = ((unsigned long *)prop_ret)[0]; info[1] = ((unsigned long *)prop_ret)[1]; Index: E16/e/src/magwin.c =================================================================== --- E16/e/src/magwin.c (revision 51690) +++ E16/e/src/magwin.c (working copy) @@ -119,7 +119,7 @@ if (sw > WinGetW(VROOT)) scale = (double)ww / (double)WinGetW(VROOT); sh = (int)((wh + .999 * scale) / scale); - if (sh > WinGetH(VROOT) && scale < (double)wh / (double)WinGetH(VROOT)) + if ((sh > WinGetH(VROOT)) && (scale < (double)wh / (double)WinGetH(VROOT))) scale = (double)wh / (double)WinGetH(VROOT); sw = (int)((ww + .999 * scale) / scale); sh = (int)((wh + .999 * scale) / scale); @@ -155,8 +155,8 @@ /* Check if pointer is in magnifier window */ EQueryPointer(EwinGetClientWin(mw->ewin), &px, &py, NULL, NULL); - out = px < 0 || px >= mw->ewin->client.w || - py < 0 || py >= mw->ewin->client.h; + out = (px < 0) || (px >= mw->ewin->client.w) || + (py < 0) || (py >= mw->ewin->client.h); /* If inside grab pixel before drawing in window */ pixel = (out) ? 0 : MagwinGetPixel(EwinGetClientXwin(mw->ewin), px, py); @@ -188,7 +188,7 @@ if (!EwinFindByPtr(mw->ewin)) return 0; - if (!mw->update && Mode.events.damage_count == mw->damage_count) + if ((!mw->update) && (Mode.events.damage_count == mw->damage_count)) return 1; mw->damage_count = Mode.events.damage_count; @@ -488,7 +488,7 @@ p += len; } - if (!p || !strcmp(cmd, "show")) + if ((!p) || (!strcmp(cmd, "show"))) { MagwinShow(); } Index: E16/e/src/snaps.c =================================================================== --- E16/e/src/snaps.c (revision 51690) +++ E16/e/src/snaps.c (working copy) @@ -133,8 +133,8 @@ for (l2 = l1; l2 > 0; l2--) { - if (role[l2 - 1] != '-' && - !(role[l2 - 1] >= '0' && role[l2 - 1] <= '9')) + if ((role[l2 - 1] != '-') && + (!((role[l2 - 1] >= '0') && (role[l2 - 1] <= '9')))) break; } if (l1 - l2 > 8) @@ -145,7 +145,7 @@ return buf; } -#define SEQ(s1, s2) ((s1) && (s2) && !strcmp(s1, s2)) +#define SEQ(s1, s2) ((s1) && (s2) && (!strcmp(s1, s2))) static int _SnapEwinMatch(const Snapshot * sn, const EWin * ewin) @@ -159,19 +159,19 @@ if (ewin->state.identified) return sn->win == EwinGetClientXwin(ewin); - if (sn->startup_id && !sn->cmd) + if ((sn->startup_id) && (!sn->cmd)) return 0; - if (sn->match_flags & SNAP_MATCH_TITLE - && !SEQ(sn->win_title, EwinGetIcccmName(ewin))) + if ((sn->match_flags & SNAP_MATCH_TITLE) + && (!SEQ(sn->win_title, EwinGetIcccmName(ewin)))) return 0; - if (sn->match_flags & SNAP_MATCH_NAME - && !SEQ(sn->win_name, EwinGetIcccmCName(ewin))) + if ((sn->match_flags & SNAP_MATCH_NAME) + && (!SEQ(sn->win_name, EwinGetIcccmCName(ewin)))) return 0; - if (sn->match_flags & SNAP_MATCH_CLASS - && !SEQ(sn->win_class, EwinGetIcccmClass(ewin))) + if ((sn->match_flags & SNAP_MATCH_CLASS) + && (!SEQ(sn->win_class, EwinGetIcccmClass(ewin)))) return 0; if (sn->match_flags & SNAP_MATCH_ROLE) @@ -191,9 +191,9 @@ const Snapshot *sn = (Snapshot *) data; const EWin *ewin = (EWin *) match; - return sn->used || - !(sn->startup_id && SEQ(sn->cmd, ewin->icccm.wm_command) && - _SnapEwinMatch(sn, ewin)); + return (sn->used) || + (!((sn->startup_id) && (SEQ(sn->cmd, ewin->icccm.wm_command)) && + (_SnapEwinMatch(sn, ewin)))); } static int @@ -202,7 +202,7 @@ const Snapshot *sn = (Snapshot *) data; const EWin *ewin = (EWin *) match; - return sn->used || !_SnapEwinMatch(sn, ewin); + return (sn->used) || (!_SnapEwinMatch(sn, ewin)); } /* find a snapshot state that applies to this ewin */ @@ -223,7 +223,7 @@ if (!sn) sn = (Snapshot *) ecore_list_find(ss_list, _SnapEwinFindMatch, ewin); - if (sn && !(sn->match_flags & SNAP_MATCH_MULTIPLE)) + if ((sn) && (!(sn->match_flags & SNAP_MATCH_MULTIPLE))) { sn->used = ewin; ewin->snap = sn; @@ -246,13 +246,13 @@ if (sn) return sn; - if ((match_flags & SNAP_MATCH_TITLE) && !EwinGetIcccmName(ewin)) + if ((match_flags & SNAP_MATCH_TITLE) && (!EwinGetIcccmName(ewin))) match_flags ^= SNAP_MATCH_TITLE; - if ((match_flags & SNAP_MATCH_NAME) && !EwinGetIcccmCName(ewin)) + if ((match_flags & SNAP_MATCH_NAME) && (!EwinGetIcccmCName(ewin))) match_flags ^= SNAP_MATCH_NAME; - if ((match_flags & SNAP_MATCH_CLASS) && !EwinGetIcccmClass(ewin)) + if ((match_flags & SNAP_MATCH_CLASS) && (!EwinGetIcccmClass(ewin))) match_flags ^= SNAP_MATCH_CLASS; - if ((match_flags & SNAP_MATCH_ROLE) && !ewin->icccm.wm_role) + if ((match_flags & SNAP_MATCH_ROLE) && (!ewin->icccm.wm_role)) match_flags ^= SNAP_MATCH_ROLE; if (match_flags == 0) { @@ -279,10 +279,10 @@ } /* Set the snap name. Has no particular significance. */ - if ((sn->win_name || sn->win_class) && sn->win_role) + if (((sn->win_name) || (sn->win_class)) && (sn->win_role)) Esnprintf(buf, sizeof(buf), "%s.%s:%s", ST(sn->win_name), ST(sn->win_class), sn->win_role); - else if (sn->win_name || sn->win_class) + else if ((sn->win_name) || (sn->win_class)) Esnprintf(buf, sizeof(buf), "%s.%s", ST(sn->win_name), ST(sn->win_class)); else if (sn->win_title) Esnprintf(buf, sizeof(buf), "TITLE.%s", sn->win_title); @@ -373,8 +373,8 @@ static void _SnapUpdateEwinCmd(Snapshot * sn, const EWin * ewin) { - if (ewin->icccm.wm_machine && - strcmp(ewin->icccm.wm_machine, Mode.wm.machine_name)) + if ((ewin->icccm.wm_machine) && + (strcmp(ewin->icccm.wm_machine, Mode.wm.machine_name))) return; Efree(sn->cmd); @@ -502,7 +502,7 @@ Snapshot *sn; /* Quit if nothing to be saved */ - if (!match_flags || !(use_flags & SNAP_USE_ALL)) + if ((!match_flags) || (!(use_flags & SNAP_USE_ALL))) return; sn = _SnapEwinGet(ewin, match_flags); @@ -523,7 +523,7 @@ Snapshot *sn; sn = ewin->snap; - if (!sn || !sn->track_changes) + if ((!sn) || (!sn->track_changes)) return; #if 0 @@ -947,7 +947,7 @@ { int i; - if (val < 2 && rd_ewin_list) + if ((val < 2) && (rd_ewin_list)) { for (i = 0; rd_ewin_list[i].snap; i++) { @@ -960,7 +960,7 @@ SnapshotsSave(); } - if (((val == 0) || (val == 2)) && rd_ewin_list) + if (((val == 0) || (val == 2)) && (rd_ewin_list)) { Efree(rd_ewin_list); rd_ewin_list = NULL; @@ -980,7 +980,7 @@ /* Make sure its still there */ sn = (Snapshot *) ecore_list_goto(ss_list, rd->snap); - if (!sn || !sn->used) + if ((!sn) || (!sn->used)) return; _EwinSnapDialog(sn->used); } @@ -1099,19 +1099,19 @@ fprintf(f, "NEW: %s\n", sn->name); if (sn->used) fprintf(f, "WIN: %#lx\n", EwinGetClientXwin(sn->used)); - if ((sn->match_flags & SNAP_MATCH_TITLE) && sn->win_title) + if ((sn->match_flags & SNAP_MATCH_TITLE) && (sn->win_title)) fprintf(f, "TITLE: %s\n", sn->win_title); - if ((sn->match_flags & SNAP_MATCH_NAME) && sn->win_name) + if ((sn->match_flags & SNAP_MATCH_NAME) && (sn->win_name)) fprintf(f, "NAME: %s\n", sn->win_name); - if ((sn->match_flags & SNAP_MATCH_CLASS) && sn->win_class) + if ((sn->match_flags & SNAP_MATCH_CLASS) && (sn->win_class)) fprintf(f, "CLASS: %s\n", sn->win_class); - if ((sn->match_flags & SNAP_MATCH_ROLE) && sn->win_role) + if ((sn->match_flags & SNAP_MATCH_ROLE) && (sn->win_role)) fprintf(f, "ROLE: %s\n", sn->win_role); if (sn->track_changes) fprintf(f, "AUTO: yes\n"); - if ((sn->use_flags & SNAP_USE_BORDER) && sn->border_name) + if ((sn->use_flags & SNAP_USE_BORDER) && (sn->border_name)) fprintf(f, "BORDER: %s\n", sn->border_name); - if ((sn->use_flags & SNAP_USE_COMMAND) && sn->cmd) + if ((sn->use_flags & SNAP_USE_COMMAND) && (sn->cmd)) fprintf(f, "CMD: %s\n", sn->cmd); if (sn->use_flags & SNAP_USE_DESK) fprintf(f, "DESKTOP: %i\n", sn->desktop); @@ -1174,7 +1174,7 @@ ECORE_LIST_FOR_EACH(ss_list, sn) { if ((sn->use_flags & SNAP_USE_COMMAND) && (sn->cmd) && - !sn->used && !(sn->match_flags & SNAP_MATCH_MULTIPLE)) + (!sn->used) && (!(sn->match_flags & SNAP_MATCH_MULTIPLE))) { sn->startup_id = ++Mode.apps.startup_id; EspawnCmd(sn->cmd); @@ -1199,7 +1199,7 @@ continue; *s++ = '\0'; s = Estrtrim(s); - if (!buf[0] || !s[0]) + if ((!buf[0]) || (!s[0])) continue; if (!strcmp(buf, "NEW")) { @@ -1256,7 +1256,7 @@ { if (sscanf(s, "%u %u", &a, &b) < 2) continue; - if (a <= 0 || b <= 0) + if ((a <= 0) || (b <= 0)) continue; res_w = a; res_h = b; @@ -1265,7 +1265,7 @@ { if (sscanf(s, "%u %u", &a, &b) < 2) continue; - if (a <= 0 || b <= 0) + if ((a <= 0) || (b <= 0)) continue; sn->use_flags |= SNAP_USE_SIZE; sn->w = a; @@ -1686,7 +1686,7 @@ return; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { ecore_list_for_each(ss_list, _SnapShow, NULL); } Index: E16/e/src/zoom.c =================================================================== --- E16/e/src/zoom.c (revision 51690) +++ E16/e/src/zoom.c (working copy) @@ -84,9 +84,9 @@ for (i = 0; i < std_vid_modes_num; i++) { info = std_vid_modes[i]; - if (info->dotclock == dotclock && - info->hdisplay == line->hdisplay && - info->vdisplay == line->vdisplay) + if ((info->dotclock == dotclock) && + (info->hdisplay == line->hdisplay) && + (info->vdisplay == line->vdisplay)) return i; } return 0; @@ -225,7 +225,7 @@ { /* Unzoom */ - if (ewin && ewin != zoom_last_ewin) + if ((ewin) && (ewin != zoom_last_ewin)) return; ewin = zoom_last_ewin; if (!ewin) @@ -266,7 +266,7 @@ void ReZoom(EWin * ewin) { - if (zoom_last_ewin && ewin == zoom_last_ewin) + if ((zoom_last_ewin) && (ewin == zoom_last_ewin)) { Zoom(ewin, 0); Zoom(ewin, 1); Index: E16/e/src/piximg.c =================================================================== --- E16/e/src/piximg.c (revision 51690) +++ E16/e/src/piximg.c (working copy) @@ -274,7 +274,7 @@ y = 0; } - if (w <= 0 || h <= 0) + if ((w <= 0) || (h <= 0)) return 1; *px = x; @@ -300,7 +300,7 @@ int w, int h, int xt, int yt) { /* FIXME - No bounds checking if (xs,ys) != (xt,yt) */ - if (xs == xt && ys == yt) + if ((xs == xt) && (ys == yt)) { if (_fix_bounds(&xs, &ys, &w, &h, NULL, NULL)) return; Index: E16/e/src/buttons.c =================================================================== --- E16/e/src/buttons.c (revision 51690) +++ E16/e/src/buttons.c (working copy) @@ -122,10 +122,10 @@ { Button *b; - if (desk < 0 || desk >= (int)DesksGetNumber()) + if ((desk < 0) || (desk >= (int)DesksGetNumber())) return NULL; - if (sticky && ontop == 1) + if ((sticky) && (ontop == 1)) desk = 0; b = ECALLOC(Button, 1); @@ -138,7 +138,7 @@ b->id = id; - if (label && *label) + if ((label) && (*label)) b->label = Estrdup(label); b->iclass = ImageclassAlloc(iclass, 1); @@ -306,7 +306,7 @@ static void ButtonMoveToDesktop(Button * b, Desk * dsk) { - if (EoIsSticky(b) && EoGetLayer(b) == 1) + if ((EoIsSticky(b)) && (EoGetLayer(b) == 1)) dsk = DeskGet(0); if (!dsk) @@ -383,7 +383,7 @@ int ButtonDoShowDefault(const Button * b) { - return !b->internal && b->default_show; + return (!b->internal) && (b->default_show); } #if 0 /* Unused */ @@ -451,9 +451,9 @@ ECORE_LIST_FOR_EACH(button_list, b) { - if (id >= 0 && id != b->id) + if ((id >= 0) && (id != b->id)) continue; - if (dsk && dsk != EoGetDesk(b)) + if ((dsk) && (dsk != EoGetDesk(b))) continue; func(b); } @@ -466,7 +466,7 @@ ECORE_LIST_FOR_EACH(button_list, b) { - if (!EoIsSticky(b) || ButtonIsInternal(b)) + if ((!EoIsSticky(b)) || (ButtonIsInternal(b))) continue; ButtonMoveToDesktop(b, dsk); @@ -480,7 +480,7 @@ static void ButtonDoAction(Button * b, XEvent * ev) { - if (b->owner && b->func) + if ((b->owner) && (b->func)) b->func(b->owner, ev, b->aclass); else ActionclassEvent(b->aclass, ev, NULL); @@ -510,18 +510,18 @@ ActionClass *ac; ac = ActionclassFind("ACTION_BUTTON_DRAG"); - if (ac && !Mode_buttons.action_inhibit) + if ((ac) && (!Mode_buttons.action_inhibit)) ActionclassEvent(ac, ev, NULL); } - if (b->aclass && !Mode_buttons.action_inhibit) + if ((b->aclass) && (!Mode_buttons.action_inhibit)) ButtonDoAction(b, ev); } static void ButtonEventMouseUp(Button * b, XEvent * ev) { - if (b->inside_win && !Mode_buttons.action_inhibit) + if ((b->inside_win) && (!Mode_buttons.action_inhibit)) { Window win = ev->xbutton.window; @@ -544,7 +544,7 @@ ButtonDragEnd(Mode_buttons.button); Mode_buttons.button = NULL; - if (b->aclass && !b->left && !Mode_buttons.action_inhibit) + if ((b->aclass) && (!b->left) && (!Mode_buttons.action_inhibit)) ButtonDoAction(b, ev); Mode_buttons.action_inhibit = 0; } @@ -588,7 +588,7 @@ { b->state = STATE_HILITED; ButtonDraw(b); - if (b->aclass && !Mode_buttons.action_inhibit) + if ((b->aclass) && (!Mode_buttons.action_inhibit)) ActionclassEvent(b->aclass, ev, NULL); } } @@ -602,7 +602,7 @@ { b->state = STATE_NORMAL; ButtonDraw(b); - if (b->aclass && !Mode_buttons.action_inhibit) + if ((b->aclass) && (!Mode_buttons.action_inhibit)) ActionclassEvent(b->aclass, ev, NULL); } } @@ -687,7 +687,7 @@ switch (i1) { case CONFIG_CLOSE: - if (!pbt && !Mode_buttons.loading_user) + if ((!pbt) && (!Mode_buttons.loading_user)) { bt = ButtonCreate(name, 0, iclass, aclass, tclass, label, ontop, flags, minw, maxw, minh, maxh, @@ -848,7 +848,7 @@ ECORE_LIST_FOR_EACH(button_list, b) { - if (b->id != 0 || b->internal) + if ((b->id != 0) || (b->internal)) continue; fprintf(fs, "4 999\n"); @@ -942,13 +942,13 @@ button_match_data *bmd = (button_match_data *) prm; int match; - if (bmd->id >= 0 && bmd->id != b->id) + if ((bmd->id >= 0) && (bmd->id != b->id)) return; if (bmd->regex) { match = matchregexp(bmd->regex, EoGetName(b)); - if ((match && !bmd->match) || (!match && bmd->match)) + if (((match) && (!bmd->match)) || ((!match) && (bmd->match))) return; #if ENABLE_DESKRAY if (!strcmp(EoGetName(b), "_DESKTOP_DESKRAY_DRAG_CONTROL")) @@ -1031,7 +1031,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { } else if (!strncmp(cmd, "list", 2)) Index: E16/e/src/setup.c =================================================================== --- E16/e/src/setup.c (revision 51690) +++ E16/e/src/setup.c (working copy) @@ -76,12 +76,12 @@ Dpy.screens = ScreenCount(disp); Dpy.screen = DefaultScreen(disp); - if (Mode.wm.master || - Mode.wm.master_screen < 0 || Mode.wm.master_screen >= Dpy.screens) + if ((Mode.wm.master) || + (Mode.wm.master_screen < 0) || (Mode.wm.master_screen >= Dpy.screens)) Mode.wm.master_screen = Dpy.screen; /* Start up on multiple heads, if appropriate */ - if (Dpy.screens > 1 && !Mode.wm.single && !Mode.wm.restart) + if ((Dpy.screens > 1) && (!Mode.wm.single) && (!Mode.wm.restart)) { int i; @@ -218,7 +218,7 @@ Mode.masks.mod_combos[3] = scrollock; Mode.masks.mod_combos[6] = LockMask | scrollock; } - if (numlock && scrollock) + if ((numlock) && (scrollock)) { Mode.masks.mod_combos[4] = numlock | scrollock; Mode.masks.mod_combos[7] = LockMask | numlock | scrollock; Index: E16/e/src/startup.c =================================================================== --- E16/e/src/startup.c (revision 51690) +++ E16/e/src/startup.c (working copy) @@ -49,7 +49,7 @@ if (!ic) ic = ImageclassFind("DESKTOP_DRAGBUTTON_HORIZ", 0); bg = BackgroundFind("STARTUP_BACKGROUND"); - if (!ic || !bg) + if ((!ic) || (!bg)) return; dbw = Conf.desks.dragbar_width; @@ -93,7 +93,7 @@ EMapWindow(win1); EMapWindow(win2); - if (bw > 0 && bh > 0) + if ((bw > 0) && (bh > 0)) { b1 = ECreateWindow(w1, bx, by, bw, bh, 0); b2 = ECreateWindow(w2, 0, 0, bw, bh, 0); @@ -168,7 +168,7 @@ void StartupWindowsOpen(void) { - if (!init_win1 || !init_win2) + if ((!init_win1) || (!init_win2)) return; Mode.place.enable_features--; Index: E16/e/src/backgrounds.c =================================================================== --- E16/e/src/backgrounds.c (revision 51690) +++ E16/e/src/backgrounds.c (working copy) @@ -86,7 +86,7 @@ static char * _BackgroundGetBgFile(Background * bg) { - if (!bg || !bg->bg.file) + if ((!bg) || (!bg->bg.file)) return NULL; return _BackgroundGetFile(&bg->bg.file); } @@ -94,7 +94,7 @@ static char * _BackgroundGetFgFile(Background * bg) { - if (!bg || !bg->top.file) + if ((!bg) || (!bg->top.file)) return NULL; return _BackgroundGetFile(&bg->top.file); } @@ -180,7 +180,7 @@ void BackgroundPixmapSet(Background * bg, Pixmap pmap) { - if (bg->pmap != None && bg->pmap != pmap) + if ((bg->pmap != None) && (bg->pmap != pmap)) Eprintf("*** BackgroundPixmapSet %s: pmap was set %#lx/%#lx\n", bg->name, bg->pmap, pmap); bg->pmap = pmap; @@ -346,7 +346,7 @@ if (*bgx->name != '.') /* Discard only generated backgrounds */ return 1; - if (bg->bg.file && bgx->bg.file) + if ((bg->bg.file) && (bgx->bg.file)) { if ((strcmp(bg->bg.file, bgx->bg.file)) || (bg->bg.keep_aspect != bgx->bg.keep_aspect) || @@ -354,10 +354,10 @@ (bg->bg.xperc != bgx->bg.xperc)) return 1; } - else if (bg->bg.file || bgx->bg.file) + else if ((bg->bg.file) || (bgx->bg.file)) return 1; - if (bg->top.file && bgx->top.file) + if ((bg->top.file) && (bgx->top.file)) { if ((strcmp(bg->top.file, bgx->top.file)) || (bg->top.keep_aspect != bgx->top.keep_aspect) || @@ -365,7 +365,7 @@ (bg->top.xperc != bgx->top.xperc)) return 1; } - else if (bg->top.file || bgx->top.file) + else if ((bg->top.file) || (bgx->top.file)) return 1; if (bg->bg_solid != bgx->bg_solid) @@ -405,7 +405,7 @@ { BackgroundPixmapFree(bg); bg->seq_no = ++bg_seq_no; - if (bg->ref_count && refresh) + if ((bg->ref_count) && (refresh)) DesksBackgroundRefresh(bg, DESK_BG_REFRESH); } @@ -429,7 +429,7 @@ else updated = 1; Efree(bg->bg.file); - bg->bg.file = (bgn && bgn[0]) ? Estrdup(bgn) : NULL; + bg->bg.file = ((bgn) && (bgn[0])) ? Estrdup(bgn) : NULL; if ((int)tile != bg->bg_tile) updated = 1; if ((int)keep_aspect != bg->bg.keep_aspect) @@ -457,7 +457,7 @@ else updated = 1; Efree(bg->top.file); - bg->top.file = (top && top[0]) ? Estrdup(top) : NULL; + bg->top.file = ((top) && (top[0])) ? Estrdup(top) : NULL; if ((int)tkeep_aspect != bg->top.keep_aspect) updated = 1; if (txjust != bg->top.xjust) @@ -536,7 +536,7 @@ * invalid one from a previous session. */ pmap = ECreatePixmap(win, w, h, 0); - if (win == RROOT && pmap == Mode.root.ext_pmap) + if ((win == RROOT) && (pmap == Mode.root.ext_pmap)) { EFreePixmap(pmap); pmap = ECreatePixmap(win, w, h, 0); @@ -578,7 +578,7 @@ hasbg = ! !bg->bg.im; hasfg = ! !bg->top.im; - if (!hasbg && !hasfg) + if ((!hasbg) && (!hasfg)) { unsigned int pixel; @@ -612,8 +612,8 @@ y = ((int)(rh - h) * bg->bg.yjust) >> 10; } - if (is_win && hasbg && !hasfg && x == 0 && y == 0 && - ((w == rw && h == rh) || (bg->bg_tile && !TransparencyEnabled()))) + if ((is_win) && (hasbg) && (!hasfg) && (x == 0) && (y == 0) && + (((w == rw) && (h == rh)) || ((bg->bg_tile) && (!TransparencyEnabled())))) { /* Window, no fg, no offset, and scale to 100%, or tiled, no trans */ pmap = BackgroundCreatePixmap(win, w, h); @@ -644,7 +644,7 @@ else pmap = draw; - if (hasbg && !hasfg && x == 0 && y == 0 && w == rw && h == rh) + if ((hasbg) && (!hasfg) && (x == 0) && (y == 0) && (w == rw) && (h == rh)) { im = bg->bg.im; } @@ -653,7 +653,7 @@ /* Create full size image */ im = EImageCreate(rw, rh); EImageSetHasAlpha(im, 0); - if (!hasbg || !bg->bg_tile) + if ((!hasbg) || (!bg->bg_tile)) { /* Fill solid */ EImageFill(im, 0, 0, rw, rh, bg->bg_solid); @@ -772,7 +772,7 @@ if (thumb) { Esnprintf(thumb, thlen, "%s/cached/img/%s.png", EDirUserCache(), bgid); - if (bg && exists(thumb) && moddate(thumb) > moddate(file)) + if ((bg) && (exists(thumb)) && (moddate(thumb) > moddate(file))) return bg; /* The thumbnail is gone or outdated - regererate */ } @@ -1026,7 +1026,7 @@ { rnd = rand(); bg = (Background *) ecore_list_index_goto(bg_list, rnd % num); - if (num <= 1 || !BackgroundIsNone(bg)) + if ((num <= 1) || (!BackgroundIsNone(bg))) break; } @@ -1090,7 +1090,7 @@ switch (ii1) { case CONFIG_CLOSE: - if (!ignore && !bg && name) + if ((!ignore) && (!bg) && (name)) BackgroundCreate(name, color, bg1, i1, i2, i3, i4, i5, i6, bg2, j1, j2, j3, j4, j5); goto done; @@ -1114,7 +1114,7 @@ break; case BG_DESKNUM: - if (!ignore && !bg && name) + if ((!ignore) && (!bg) && (name)) bg = BackgroundCreate(name, color, bg1, i1, i2, i3, i4, i5, i6, bg2, j1, j2, j3, j4, j5); if (!bg) @@ -1124,7 +1124,7 @@ break; if (desk >= 0) { - if (!bg_assigned[desk] || Conf.backgrounds.user) + if ((!bg_assigned[desk]) || (Conf.backgrounds.user)) { bg_assigned[desk] = bg; bg->referenced = 1; @@ -1145,7 +1145,7 @@ r = g = b = 0; sscanf(s, "%*s %d %d %d", &r, &g, &b); COLOR32_FROM_RGB(color, r, g, b); - if (bg && ignore) + if ((bg) && (ignore)) bg->bg_solid = color; break; @@ -1244,7 +1244,7 @@ _BackgroundGetBgFile(bg); _BackgroundGetFgFile(bg); /* Discard if bg file is given but cannot be found (ignore bad fg) */ - if (bg->bg.file && !isabspath(bg->bg.file)) + if ((bg->bg.file) && (!isabspath(bg->bg.file))) { Eprintf("Discard broken background %s (%s)\n", bg->name, bg->bg.file); @@ -1300,7 +1300,7 @@ break; for (; (bgx = (Background *) ecore_list_next(bg_list));) { - if (bgx->ref_count > 0 || bgx->referenced) + if ((bgx->ref_count > 0) || (bgx->referenced)) continue; if (BackgroundCmp(bg, bgx)) @@ -1326,7 +1326,7 @@ ECORE_LIST_FOR_EACH(bg_list, bg) { /* Skip if no pixmap or not timed out */ - if (bg->pmap == None || + if ((bg->pmap == None) || ((now - bg->last_viewed) <= Conf.backgrounds.timeout)) continue; @@ -1512,7 +1512,7 @@ static void BgDialogSetNewCurrent(Background * bg) { - if (tmp_bg && tmp_bg != bg) + if ((tmp_bg) && (tmp_bg != bg)) BackgroundImagesKeep(tmp_bg, 0); tmp_bg = bg; BackgroundImagesKeep(tmp_bg, 1); @@ -1739,7 +1739,7 @@ x = (num * (64 + 8) - w) * tmp_bg_sel_sliderval / (4 * num) + ev->xbutton.x; bg = (Background *) ecore_list_index_goto(bg_list, x / (64 + 8)); - if (!bg || bg == DeskBackgroundGet(DesksGetCurrent())) + if ((!bg) || (bg == DeskBackgroundGet(DesksGetCurrent()))) break; BgDialogSetNewCurrent(bg); DeskBackgroundSet(DesksGetCurrent(), bg); @@ -1828,7 +1828,7 @@ name1 = BackgroundGetBgFile(bg1); name2 = BackgroundGetBgFile(bg2); - if (name1 && name2) + if ((name1) && (name2)) return strcmp(name1, name2); if (name1) return 1; @@ -2233,7 +2233,7 @@ Background *bg; unsigned int color; - if (!p || !p[0]) + if ((!p) || (!p[0])) return; bg = BackgroundFind(name); @@ -2379,7 +2379,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { for (i = 0; i < (int)DesksGetNumber(); i++) { Index: E16/e/src/progress.c =================================================================== --- E16/e/src/progress.c (revision 51690) +++ E16/e/src/progress.c (working copy) @@ -73,7 +73,7 @@ p->n_win = EobjWindowCreate(EOBJ_TYPE_MISC, x + w - (h * 5), y, (h * 5), h, 1, "pn"); p->p_win = EobjWindowCreate(EOBJ_TYPE_MISC, x, y + h, 1, h, 1, "pp"); - if (!p->win || !p->n_win || !p->p_win) + if ((!p->win) || (!p->n_win) || (!p->p_win)) { ProgressbarDestroy(p); return NULL; Index: E16/e/src/aclass.c =================================================================== --- E16/e/src/aclass.c (revision 51690) +++ E16/e/src/aclass.c (working copy) @@ -102,7 +102,7 @@ aa->anybutton = anybut; aa->button = but; aa->anykey = anykey; - if (!key || !key[0] || (event != EVENT_KEY_DOWN && event != EVENT_KEY_UP)) + if ((!key) || (!key[0]) || ((event != EVENT_KEY_DOWN) && (event != EVENT_KEY_UP))) aa->key = 0; else aa->key = EKeynameToKeycode(key); @@ -139,7 +139,7 @@ return; at->next = NULL; - at->params = (params && *params) ? Estrdup(params) : NULL; + at->params = ((params) && (*params)) ? Estrdup(params) : NULL; if (!aa->action) { aa->action = at; @@ -482,7 +482,7 @@ } } - if (ac && err) + if ((ac) && (err)) ActionclassDestroy(ac); done: @@ -574,7 +574,7 @@ anybut = 1; else if (isdigit(key[0])) button = atoi(key); - if (!anybut && button == 0) + if ((!anybut) && (button == 0)) return NULL; /* Invalid */ key[0] = '\0'; break; @@ -593,7 +593,7 @@ const char *event; char *p, mod[32], btn[32]; - if (!aa || !aa->action) + if ((!aa) || (!aa->action)) return 0; p = mod; @@ -730,7 +730,7 @@ mode_keybinds_changed = 1; aa = NULL; } - else if (!strncmp(prm1, "Key", 3) || !strncmp(prm1, "Mouse", 5)) + else if ((!strncmp(prm1, "Key", 3)) || (!strncmp(prm1, "Mouse", 5))) { if (!ac) return; @@ -818,7 +818,7 @@ Action *aa; int i, len; - if (!ac || ac->num <= 0) + if ((!ac) || (ac->num <= 0)) return; prf("Aclass %s %s\n", ac->name, (ac->global)? "global" : "normal"); @@ -892,7 +892,7 @@ { ActionClass *ac; - if (!name || !name[0]) + if ((!name) || (!name[0])) return NULL; ac = ActionclassFind(name); @@ -930,7 +930,7 @@ Action * ActionclassGetAction(ActionClass * ac, int ix) { - return (ac && ix < ac->num) ? ac->list[ix] : NULL; + return ((ac) && (ix < ac->num)) ? ac->list[ix] : NULL; } const char * @@ -994,7 +994,7 @@ int i, type, button, modifiers, ok, mouse, mask, val = 0; Action *aa; - if (ewin && ewin->state.inhibit_actions) + if ((ewin) && (ewin->state.inhibit_actions)) return 0; key = type = button = modifiers = mouse = 0; @@ -1038,9 +1038,9 @@ break; case LeaveNotify: /* If frame window, quit if pointer is still inside */ - if (ewin && ev->xcrossing.window == EoGetXwin(ewin) && - (ev->xcrossing.x >= 0 && ev->xcrossing.x < EoGetW(ewin) && - ev->xcrossing.y >= 0 && ev->xcrossing.y < EoGetH(ewin))) + if ((ewin) && (ev->xcrossing.window == EoGetXwin(ewin)) && + ((ev->xcrossing.x >= 0) && (ev->xcrossing.x < EoGetW(ewin)) && + (ev->xcrossing.y >= 0) && (ev->xcrossing.y < EoGetH(ewin)))) return 0; type = EVENT_MOUSE_LEAVE; button = -1; @@ -1193,7 +1193,7 @@ p += len; } - if (!p || cmd[0] == '\0' || cmd[0] == '?') + if ((!p) || (cmd[0] == '\0') || (cmd[0] == '?')) { } else if (!strncmp(cmd, "kb", 2)) @@ -1326,7 +1326,7 @@ const char *sp, *ss; ss = params; - if (!ss || !ss[0]) + if ((!ss) || (!ss[0])) return; mode_keybinds_changed = 1; Index: E16/e/src/x.c =================================================================== --- E16/e/src/x.c (revision 51690) +++ E16/e/src/x.c (working copy) @@ -231,7 +231,7 @@ ecl = &win->cbl; eci = ecl->lst; for (i = 0; i < ecl->num; i++, eci++) - if (eci->func == func && eci->prm == prm) + if ((eci->func == func) && (eci->prm == prm)) { ecl->num--; if (ecl->num) @@ -340,7 +340,7 @@ Visual *vis; Colormap cmap; - if (cwin && Conf.testing.argb_clients_inherit_attr) + if ((cwin) && (Conf.testing.argb_clients_inherit_attr)) { depth = cwin->depth; vis = cwin->visual; @@ -370,7 +370,7 @@ { Colormap cmap; - if (!vis || depth == 0) + if ((!vis) || (depth == 0)) return 0; cmap = XCreateColormap(disp, WinGetXwin(VROOT), vis, AllocNone); @@ -396,7 +396,7 @@ case WIN_TYPE_NO_ARGB: break; case WIN_TYPE_CLIENT: - if (Conf.testing.argb_clients || EVisualIsARGB(cwin->visual)) + if ((Conf.testing.argb_clients) || (EVisualIsARGB(cwin->visual))) argb = 1; break; case WIN_TYPE_INTERNAL: @@ -534,7 +534,7 @@ if ((w == win->w) && (h == win->h) && (x == win->x) && (y == win->y)) return; - if (w != win->w || h != win->h) + if ((w != win->w) || (h != win->h)) WinBgInvalidate(win); win->x = x; @@ -956,7 +956,7 @@ if (!win) return; - if (win->bgpmap && win->bg_owned) + if ((win->bgpmap) && (win->bg_owned)) EFreeWindowBackgroundPixmap(win); win->bgpmap = pmap; win->bg_owned = 0; /* Don't manage pixmap */ @@ -989,7 +989,7 @@ void EFreeWindowBackgroundPixmap(Win win) { - if (!win || !win->bgpmap) + if ((!win) || (!win->bgpmap)) return; if (win->bg_owned) @@ -1185,7 +1185,7 @@ ok = EXGetGeometry(draw, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if (grab && !ok) + if ((grab) && (!ok)) EUngrabServer(); return ok; @@ -1286,7 +1286,7 @@ if (!win) return; - if (win->rects || win->num_rect < 0) + if ((win->rects) || (win->num_rect < 0)) { win->num_rect = 0; if (win->rects) @@ -1338,7 +1338,7 @@ Eprintf("EShapeCombineRectangles %#lx %d\n", win->xwin, n_rects); #endif - if (n_rects == 1 && op == ShapeSet) + if ((n_rects == 1) && (op == ShapeSet)) { if ((rect[0].x == 0) && (rect[0].y == 0) && (rect[0].width == win->w) && (rect[0].height == win->h)) @@ -1386,7 +1386,7 @@ int x, y, w, h; XRectangle *rects, *rectsn, *rl; - if (!win || win->w <= 0 || win->h <= 0) + if ((!win) || (win->w <= 0) || (win->h <= 0)) return 0; #if DEBUG_SHAPE_PROPAGATE @@ -1414,7 +1414,7 @@ y = xch->y; w = xch->w; h = xch->h; - if (x >= win->w || y >= win->h || x + w < 0 || y + h < 0) + if ((x >= win->w) || (y >= win->h) || (x + w < 0) || (y + h < 0)) continue; rn = xch->num_rect; @@ -1763,7 +1763,7 @@ static int HandleXError(Display * dpy __UNUSED__, XErrorEvent * ev) { - if (EDebug(1) && EXErrorFunc) + if ((EDebug(1)) && (EXErrorFunc)) EXErrorFunc(ev); Dpy.last_error_code = ev->error_code; @@ -1898,7 +1898,7 @@ Eprintf("Visual ID=%#lx Type=%d, alphamask=%d\n", vis->visualid, pictfmt->type, pictfmt->direct.alphaMask); #endif - return pictfmt->type == PictTypeDirect && pictfmt->direct.alphaMask; + return (pictfmt->type == PictTypeDirect) && (pictfmt->direct.alphaMask); } #endif @@ -1939,8 +1939,8 @@ { XWindowAttributes xwa; - if (XGetWindowAttributes(disp, win->xwin, &xwa) == 0 || - xwa.map_state == IsUnmapped) + if ((XGetWindowAttributes(disp, win->xwin, &xwa) == 0) || + (xwa.map_state == IsUnmapped)) return None; return XCompositeNameWindowPixmap(disp, WinGetXwin(win)); @@ -2153,7 +2153,7 @@ void ERegionTranslate(XserverRegion rgn, int dx, int dy) { - if (dx == 0 && dy == 0) + if ((dx == 0) && (dy == 0)) return; XFixesTranslateRegion(disp, rgn, dx, dy); } @@ -2184,7 +2184,7 @@ XserverRegion rgn; rgn = src; - if (dx != 0 || dy != 0) + if ((dx != 0) || (dy != 0)) { rgn = ERegionCopy(tmp, src); XFixesTranslateRegion(dpy, rgn, dx, dy); @@ -2240,7 +2240,7 @@ } pr = XFixesFetchRegion(disp, rgn, &nr); - if (!pr || nr <= 0) + if ((!pr) || (nr <= 0)) { prf(" - region: %s %#lx is empty\n", txt, rgn); goto done; Index: E16/e/src/mod-misc.c =================================================================== --- E16/e/src/mod-misc.c (revision 51690) +++ E16/e/src/mod-misc.c (working copy) @@ -125,7 +125,7 @@ { int size_old, size_new; - if (!value || !value[0]) + if ((!value) || (!value[0])) return; size_new = atoi(value); Index: E16/e/src/ecompmgr.c =================================================================== --- E16/e/src/ecompmgr.c (revision 51690) +++ E16/e/src/ecompmgr.c (working copy) @@ -246,7 +246,7 @@ { XserverRegion rgn = rgn_tmp2; - if (!eo || !eo->cmhook) + if ((!eo) || (!eo->cmhook)) return; ERegionCopy(rgn, Mode_compmgr.rgn_screen); @@ -262,7 +262,7 @@ int wo, ho; ECmWinInfo *cw = eo->cmhook; - if (!cw || !Conf_compmgr.resize_fix_enable) + if ((!cw) || (!Conf_compmgr.resize_fix_enable)) { EMoveResizeWindow(EobjGetWin(eo), x, y, w, h); return; @@ -270,7 +270,7 @@ wo = ho = 0; EGetGeometry(EobjGetWin(eo), NULL, NULL, NULL, &wo, &ho, NULL, NULL); - if (wo <= 0 || ho <= 0 || (wo == w && ho == h)) + if ((wo <= 0) || (ho <= 0) || ((wo == w) && (ho == h))) { EMoveResizeWindow(EobjGetWin(eo), x, y, w, h); return; @@ -368,7 +368,7 @@ break; } - visible = dsk->viewable && ev->xvisibility.state != VisibilityFullyObscured; + visible = (dsk->viewable) && (ev->xvisibility.state != VisibilityFullyObscured); if (dsk->visible == visible) return; dsk->visible = visible; @@ -419,10 +419,10 @@ ECmWinInfo *cw = eo->cmhook; Desk *dsk = eo->desk; - if (!Mode_compmgr.active || damage == None) + if ((!Mode_compmgr.active) || (damage == None)) return; - if (dsk->num > 0 && !dsk->viewable && eo->ilayer < 512) + if ((dsk->num > 0) && (!dsk->viewable) && (eo->ilayer < 512)) return; if (Mode_compmgr.reorder) @@ -432,15 +432,15 @@ damage = ERegionCopy(rgn_tmp, damage); #if USE_CLIP_RELATIVE_TO_DESK - if (cw->have_clip && eo->type != EOBJ_TYPE_DESK) + if ((cw->have_clip) && (eo->type != EOBJ_TYPE_DESK)) ERegionSubtract(damage, cw->clip); #endif - if (EoGetX(dsk) != 0 || EoGetY(dsk) != 0) + if ((EoGetX(dsk) != 0) || (EoGetY(dsk) != 0)) ERegionTranslate(damage, EoGetX(dsk), EoGetY(dsk)); #if !USE_CLIP_RELATIVE_TO_DESK - if (cw->have_clip && eo->type != EOBJ_TYPE_DESK) + if ((cw->have_clip) && (eo->type != EOBJ_TYPE_DESK)) ERegionSubtract(damage, cw->clip); #endif if (!eo->ghost) @@ -641,7 +641,7 @@ * top/bottom */ x_diff = swidth - (gsize * 2); - if (x_diff > 0 && ylimit > 0) + if ((x_diff > 0) && (ylimit > 0)) { for (y = 0; y < ylimit; y++) { @@ -730,7 +730,7 @@ cw->rch = EobjGetH(eo); } - if (eo->noredir && bw) + if ((eo->noredir) && (bw)) { r.x = EobjGetX(eo); r.y = EobjGetY(eo); @@ -750,7 +750,7 @@ #if ENABLE_SHADOWS cw->has_shadow = (Mode_compmgr.shadow_mode != ECM_SHADOWS_OFF) && - eo->shadow && (EShapeCheck(EobjGetWin(eo)) >= 0); + (eo->shadow) && (EShapeCheck(EobjGetWin(eo)) >= 0); if (!cw->has_shadow) goto skip_shadow; @@ -908,7 +908,7 @@ D1printf("ECompMgrWinInvalidate %#lx: %#x\n", EobjGetXwin(eo), what); - if ((what & (INV_SIZE | INV_PIXMAP)) && cw->pixmap != None) + if ((what & (INV_SIZE | INV_PIXMAP)) && (cw->pixmap != None)) { XFreePixmap(dpy, cw->pixmap); cw->pixmap = None; @@ -950,7 +950,7 @@ ECmWinInfo *cw = eo->cmhook; int mode; - if (!cw || cw->opacity == opacity) + if ((!cw) || (cw->opacity == opacity)) return; cw->opacity = opacity; @@ -958,7 +958,7 @@ D1printf("ECompMgrWinSetOpacity: %#lx opacity=%#x\n", EobjGetXwin(eo), cw->opacity); - if (eo->shown || cw->fadeout) + if ((eo->shown) || (cw->fadeout)) ECompMgrDamageMergeObject(eo, cw->extents); /* Invalidate stuff changed by opacity */ @@ -1051,7 +1051,7 @@ { ECmWinInfo *cw = eo->cmhook; - if (op_from == op_to && op_to == eo->opacity) + if ((op_from == op_to) && (op_to == eo->opacity)) { if (eo->fading) ECompMgrWinFadeEnd(eo, 0); @@ -1123,7 +1123,7 @@ if (!cw) return; - if (eo->shown && Conf_compmgr.fading.enable && eo->fade) + if ((eo->shown) && (Conf_compmgr.fading.enable) && (eo->fade)) ECompMgrWinFade(eo, cw->opacity, opacity); else ECompMgrWinSetOpacity(eo, opacity); @@ -1150,7 +1150,7 @@ _ECM_SET_STACK_CHANGED(); ECompMgrDamageMergeObject(eo, cw->extents); - if (Conf_compmgr.fading.enable && eo->fade) + if ((Conf_compmgr.fading.enable) && (eo->fade)) ECompMgrWinFadeIn(eo); } @@ -1165,7 +1165,7 @@ ECompMgrDamageMergeObject(eo, cw->extents); _ECM_SET_STACK_CHANGED(); - if (Conf_compmgr.fading.enable && eo->fade && !eo->gone) + if ((Conf_compmgr.fading.enable) && (eo->fade) && (!eo->gone)) { ECompMgrWinInvalidate(eo, INV_PICTURE); ECompMgrWinFadeOut(eo); @@ -1179,8 +1179,8 @@ { ECmWinInfo *cw = eo->cmhook; - if (cw->pixmap == None && eo->shown && !eo->noredir && - (Mode_compmgr.use_pixmap || (eo->fade && Conf_compmgr.fading.enable))) + if ((cw->pixmap == None) && (eo->shown) && (!eo->noredir) && + ((Mode_compmgr.use_pixmap) || ((eo->fade) && (Conf_compmgr.fading.enable)))) { cw->pixmap = EWindowGetPixmap(EobjGetWin(eo)); D1printf("ECompMgrWinSetPicts %#lx: Pmap=%#lx\n", EobjGetXwin(eo), @@ -1193,7 +1193,7 @@ XRenderPictureAttributes pa; Drawable draw = EobjGetXwin(eo); - if ((cw->pixmap && Mode_compmgr.use_pixmap) || (cw->fadeout)) + if (((cw->pixmap) && (Mode_compmgr.use_pixmap)) || (cw->fadeout)) draw = cw->pixmap; if (draw == None) return; @@ -1206,7 +1206,7 @@ EobjGetXwin(eo), cw->picture, draw); /* Hmm.. What good does this actually do? */ - if (draw == cw->pixmap && EobjIsShaped(eo)) + if ((draw == cw->pixmap) && (EobjIsShaped(eo))) { XserverRegion clip; @@ -1225,7 +1225,7 @@ if (!Mode_compmgr.active) /* FIXME - Here? */ return; - if (eo->inputonly || EobjGetWin(eo) == VROOT) + if ((eo->inputonly) || (EobjGetWin(eo) == VROOT)) { eo->noredir = 1; return; @@ -1239,8 +1239,8 @@ eo->cmhook = cw; - if (eo->type == EOBJ_TYPE_EXT && - Conf_compmgr.override_redirect.mode == ECM_OR_UNREDIRECTED) + if ((eo->type == EOBJ_TYPE_EXT) && + (Conf_compmgr.override_redirect.mode == ECM_OR_UNREDIRECTED)) { eo->noredir = 1; eo->fade = 0; @@ -1276,7 +1276,7 @@ if (eo->opacity == 0) eo->opacity = 0xFFFFFFFF; - if (eo->type == EOBJ_TYPE_DESK || eo->type == EOBJ_TYPE_ROOT_BG) + if ((eo->type == EOBJ_TYPE_DESK) || (eo->type == EOBJ_TYPE_ROOT_BG)) { ESelectInputChange(EobjGetWin(eo), VisibilityChangeMask, 0); } @@ -1300,9 +1300,9 @@ EobjGetXwin(eo), change_xy, change_wh, change_bw); invalidate = 0; - if (change_xy || change_bw) + if ((change_xy) || (change_bw)) invalidate |= INV_POS; - if (change_wh || change_bw) + if ((change_wh) || (change_bw)) invalidate |= INV_SIZE; if (!invalidate) @@ -1358,16 +1358,16 @@ { ECmWinInfo *cw = eo->cmhook; - if (!cw || !eo->shown) + if ((!cw) || (!eo->shown)) goto done; - if (!shadow && eo->shadow) + if ((!shadow) && (eo->shadow)) { /* Disable shadow */ ECompMgrDamageMergeObject(eo, cw->extents); ECompMgrWinInvalidate(eo, INV_SHADOW); } - else if (shadow && !eo->shadow) + else if ((shadow) && (!eo->shadow)) { /* Enable shadow */ ECompMgrWinInvalidate(eo, INV_SHADOW); @@ -1391,8 +1391,8 @@ h = ev->xconfigure.height; bw = ev->xconfigure.border_width; - change_xy = EobjGetX(eo) != x || EobjGetY(eo) != y; - change_wh = EobjGetW(eo) != w || EobjGetH(eo) != h; + change_xy = (EobjGetX(eo) != x) || (EobjGetY(eo) != y); + change_wh = (EobjGetW(eo) != w) || (EobjGetH(eo) != h); change_bw = EobjGetBW(eo) != bw; EWindowSetGeometry(EobjGetWin(eo), x, y, w, h, bw); @@ -1494,8 +1494,8 @@ if (eo->noredir) { - if (Mode_compmgr.mode == ECM_MODE_ROOT && - eo->type == EOBJ_TYPE_DESK) + if ((Mode_compmgr.mode == ECM_MODE_ROOT) && + (eo->type == EOBJ_TYPE_DESK)) XCompositeUnredirectSubwindows(disp, EobjGetXwin(eo), CompositeRedirectManual); } @@ -1568,7 +1568,7 @@ return; } - if (ipc || EDebug(EDBUG_TYPE_COMPMGR3)) + if ((ipc) || (EDebug(EDBUG_TYPE_COMPMGR3))) { prf(" - pict=%#lx pmap=%#lx\n", cw->picture, cw->pixmap); @@ -1630,7 +1630,7 @@ if (!cw) continue; - if ((!eo->shown && !eo->fading) || eo->desk != dsk) + if (((!eo->shown) && (!eo->fading)) || (eo->desk != dsk)) continue; if (EobjHasEmptyShape(eo)) @@ -1675,7 +1675,7 @@ #if USE_BG_WIN_ON_ALL_DESKS /* Only if using per desk bg overlay */ /* FIXME - We should break when the clip region becomes empty */ - if (EobjGetX(eo) == 0 && EobjGetY(eo) == 0) + if ((EobjGetX(eo) == 0) && (EobjGetY(eo) == 0)) stop = 1; if (stop) break; @@ -1697,7 +1697,7 @@ if (!cw->damaged) continue; #endif - if (cw->picture == None && !eo->noredir) + if ((cw->picture == None) && (!eo->noredir)) continue; if (eo->ghost) @@ -1741,8 +1741,8 @@ #if !USE_BG_WIN_ON_ALL_DESKS /* Not if using per desk bg overlay */ /* FIXME - We should break when the clip region becomes empty */ - if (eo->type == EOBJ_TYPE_DESK && - EobjGetX(eo) == 0 && EobjGetY(eo) == 0) + if ((eo->type == EOBJ_TYPE_DESK) && + (EobjGetX(eo) == 0) && (EobjGetY(eo) == 0)) stop = 1; if (stop) break; @@ -1832,7 +1832,7 @@ if (EDebug(EDBUG_TYPE_COMPMGR2)) ECompMgrWinDumpInfo("ECompMgrRepaintObj trans", eo, clip, 0); EPictureSetClip(pbuf, clip); - if (cw->opacity != OPAQUE && !cw->pict_alpha) + if ((cw->opacity != OPAQUE) && (!cw->pict_alpha)) cw->pict_alpha = EPictureCreateSolid(Mode_compmgr.root, True, OP32To8(cw->opacity), @@ -1856,7 +1856,7 @@ { case ECM_SHADOWS_SHARP: case ECM_SHADOWS_ECHO: - if (cw->opacity != OPAQUE && !cw->shadow_alpha) + if ((cw->opacity != OPAQUE) && (!cw->shadow_alpha)) cw->shadow_alpha = EPictureCreateSolid(Mode_compmgr.root, True, OP32To8(cw->opacity * @@ -1881,7 +1881,7 @@ if (cw->shadow_pict == None) break; - if (cw->opacity != OPAQUE && !cw->pict_alpha) + if ((cw->opacity != OPAQUE) && (!cw->pict_alpha)) cw->pict_alpha = EPictureCreateSolid(Mode_compmgr.root, True, OP32To8(cw->opacity), @@ -1908,7 +1908,7 @@ for (i = 0; i < num; i++) { eo = lst[i]; - if (!eo->shown || !eo->ghost) + if ((!eo->shown) || (!eo->ghost)) continue; switch (eo->cmhook->mode) @@ -1936,7 +1936,7 @@ Picture pbuf; Desk *dsk = DeskGet(0); - if (!Mode_compmgr.active || !Mode_compmgr.got_damage) + if ((!Mode_compmgr.active) || (!Mode_compmgr.got_damage)) return; ERegionIntersect(Mode_compmgr.damage, Mode_compmgr.rgn_screen); @@ -2139,7 +2139,7 @@ XRenderPictFormat *pictfmt; XRenderPictureAttributes pa; - if (Mode_compmgr.active || Conf_compmgr.mode == ECM_MODE_OFF) + if ((Mode_compmgr.active) || (Conf_compmgr.mode == ECM_MODE_OFF)) return; Conf_compmgr.enable = Mode_compmgr.active = 1; Mode_compmgr.mode = Conf_compmgr.mode; @@ -2151,7 +2151,7 @@ Mode_compmgr.root = WinGetXwin(VROOT); #if USE_COMPOSITE_OVERLAY_WINDOW - if (Conf_compmgr.use_cow && !Mode.wm.window) + if ((Conf_compmgr.use_cow) && (!Mode.wm.window)) { Mode_compmgr.cow = XCompositeGetOverlayWindow(disp, WinGetXwin(VROOT)); if (Mode_compmgr.cow != None) @@ -2376,7 +2376,7 @@ ECompMgrWinMap(eo); break; case UnmapNotify: - if (eo->type == EOBJ_TYPE_EXT && eo->cmhook) + if ((eo->type == EOBJ_TYPE_EXT) && (eo->cmhook)) { ECompMgrWinUnmap(eo); eo->shown = 0; @@ -2429,7 +2429,7 @@ xwin = ev->xdestroywindow.window; case_DestroyNotify: eo = EobjListStackFind(xwin); - if (eo && eo->type == EOBJ_TYPE_EXT) + if ((eo) && (eo->type == EOBJ_TYPE_EXT)) { if (ev->type == DestroyNotify) eo->gone = 1; @@ -2453,7 +2453,7 @@ else { eo = EobjListStackFind(ev->xconfigure.window); - if (eo && eo->type == EOBJ_TYPE_EXT && eo->cmhook) + if ((eo) && (eo->type == EOBJ_TYPE_EXT) && (eo->cmhook)) { ECompMgrWinConfigure(eo, ev); } @@ -2468,7 +2468,7 @@ eo = EobjListStackFind(ev->xmap.window); if (!eo) eo = EobjRegister(ev->xmap.window, EOBJ_TYPE_EXT); - if (eo && eo->type == EOBJ_TYPE_EXT && eo->cmhook) + if ((eo) && (eo->type == EOBJ_TYPE_EXT) && (eo->cmhook)) { eo->shown = 1; EobjListStackRaise(eo, 0); @@ -2479,7 +2479,7 @@ case UnmapNotify: case EX_EVENT_UNMAP_GONE: eo = EobjListStackFind(ev->xunmap.window); - if (eo && eo->type == EOBJ_TYPE_EXT && eo->cmhook) + if ((eo) && (eo->type == EOBJ_TYPE_EXT) && (eo->cmhook)) { if (ev->type == EX_EVENT_UNMAP_GONE) eo->gone = 1; @@ -2500,7 +2500,7 @@ case CirculateNotify: eo = EobjListStackFind(ev->xcirculate.window); - if (eo && eo->cmhook) + if ((eo) && (eo->cmhook)) ECompMgrWinCirculate(eo, ev); break; @@ -2543,7 +2543,7 @@ static void ECompMgrSighan(int sig, void *prm __UNUSED__) { - if (sig != ESIGNAL_INIT && Mode_compmgr.mode == ECM_MODE_OFF) + if ((sig != ESIGNAL_INIT) && (Mode_compmgr.mode == ECM_MODE_OFF)) return; switch (sig) @@ -2573,7 +2573,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { IpcPrintf("CompMgr - on=%d\n", Mode_compmgr.active); } Index: E16/e/src/ipc.c =================================================================== --- E16/e/src/ipc.c (revision 51690) +++ E16/e/src/ipc.c (working copy) @@ -101,7 +101,7 @@ vnew = vold = *item != 0; /* Remember old value */ - if (!value || value[0] == '\0') + if ((!value) || (value[0] == '\0')) vnew = !vold; else if (!strcmp(value, "on")) vnew = 1; @@ -140,7 +140,7 @@ p += l; } - if (!p || !strncmp(param, "list", 2)) + if ((!p) || (!strncmp(param, "list", 2))) { ScreenShowInfo(p); } @@ -238,9 +238,9 @@ if (!strncmp(param1, "move", 2)) { - if (param2[0] == '\n' || param2[0] == '?') + if ((param2[0] == '\n') || (param2[0] == '?')) { - if (Conf.movres.mode_move < 0 || Conf.movres.mode_move > 5) + if ((Conf.movres.mode_move < 0) || (Conf.movres.mode_move > 5)) Conf.movres.mode_move = 0; IpcPrintf("Move mode: %s\n", MovResCfgMoveModes[Conf.movres.mode_move]); @@ -260,9 +260,9 @@ } else if (!strncmp(param1, "resize", 2)) { - if (param2[0] == '\n' || param2[0] == '?') + if ((param2[0] == '\n') || (param2[0] == '?')) { - if (Conf.movres.mode_resize < 0 || Conf.movres.mode_resize > 4) + if ((Conf.movres.mode_resize < 0) || (Conf.movres.mode_resize > 4)) Conf.movres.mode_resize = 0; IpcPrintf("Resize mode: %s\n", MovResCfgResizeModes[Conf.movres.mode_resize]); @@ -282,9 +282,9 @@ } else if (!strncmp(param1, "info", 2)) { - if (param2[0] == '\n' || param2[0] == '?') + if ((param2[0] == '\n') || (param2[0] == '?')) { - if (Conf.movres.mode_info < 0 || Conf.movres.mode_info > 2) + if ((Conf.movres.mode_info < 0) || (Conf.movres.mode_info > 2)) Conf.movres.mode_info = 1; IpcPrintf("Info mode: %s\n", MovResCfgInfoModes[Conf.movres.mode_info]); @@ -321,7 +321,7 @@ sscanf(params, "%8s %n", format, &num); match += num; } - if (!match || !match[0]) + if ((!match) || (!match[0])) match = "all"; lst = EwinsFindByExpr(match, &num, NULL); @@ -705,7 +705,7 @@ b += a; a = (b < 0) ? 1 : (b > 100) ? 100 : b; EwinOpSetOpacity(ewin, OPSRC_USER, a); - if (a && ewin->state.active) + if ((a) && (ewin->state.active)) { EoChangeOpacity(ewin, OpacityFromPercent(a)); TIMER_DEL(op_timer); @@ -1231,7 +1231,7 @@ ewin = EwinFindByExpr(param1); enew = EwinFindByExpr(param2); - if (!ewin || !enew) + if ((!ewin) || (!enew)) IpcPrintf("No matching client or target EWin found\n"); else EwinReparent(ewin, EwinGetClientWin(enew)); @@ -1712,7 +1712,7 @@ num = 0; if (params) sscanf(params, "%100s %n", cmd, &num); - prm = (num > 0 && params[num]) ? params + num : NULL; + prm = ((num > 0) && (params[num])) ? params + num : NULL; lst = IPC_GetList(&num); @@ -1720,7 +1720,7 @@ for (i = 0; i < num; i++) { ipc = lst[i]; - if (!(ipc->nick && !strcmp(cmd, ipc->nick)) && strcmp(cmd, ipc->name)) + if ((!((ipc->nick) && (!strcmp(cmd, ipc->nick)))) && (strcmp(cmd, ipc->name))) continue; ipc->func(prm); @@ -1729,7 +1729,7 @@ break; } - if (!ok && params) + if ((!ok) && (params)) ok = IPC_Compat(params); return ok; @@ -1767,7 +1767,7 @@ EWin *ewin; ewin = (EWin *) prm[0]; - if (ewin && !EwinFindByPtr(ewin)) + if ((ewin) && (!EwinFindByPtr(ewin))) goto done; EFunc(ewin, (const char *)prm[1]); @@ -1866,8 +1866,8 @@ for (i = 0; i < num; i++) { ipc = lst[i]; - if (strcmp(params, ipc->name) && - (!ipc->nick || strcmp(params, ipc->nick))) + if ((strcmp(params, ipc->name)) && + ((!ipc->nick) || (strcmp(params, ipc->nick)))) continue; nick = (ipc->nick) ? ipc->nick : ""; Index: E16/e/src/iclass.c =================================================================== --- E16/e/src/iclass.c (revision 51690) +++ E16/e/src/iclass.c (working copy) @@ -82,7 +82,7 @@ int TransparencyUpdateNeeded(void) { - return Conf.trans.alpha || prev_alpha; + return (Conf.trans.alpha) || (prev_alpha); } static void @@ -234,7 +234,7 @@ static void ImagestateColorsAlloc(ImageState * is) { - if (!is || is->got_colors) + if ((!is) || (is->got_colors)) return; is->bg_pixel = EAllocColor(WinGetCmap(VROOT), is->bg); @@ -264,7 +264,7 @@ if (is->real_file) { is->im = EImageLoad(is->real_file); - if (is->im && is->rotate) + if ((is->im) && (is->rotate)) EImageOrientate(is->im, is->rotate); } if (!is->im) @@ -356,7 +356,7 @@ { ImageClass *ic; - if (!name || !name[0]) + if ((!name) || (!name[0])) return NULL; ic = ImageclassFind(name, fallback); @@ -399,7 +399,7 @@ if (name) ic = (ImageClass *) ecore_list_find(iclass_list, _ImageclassMatchName, name); - if (ic || !fallback) + if ((ic) || (!fallback)) return ic; #if 0 @@ -414,7 +414,7 @@ static void ImageclassPopulate(ImageClass * ic) { - if (!ic || !ic->norm.normal) + if ((!ic) || (!ic->norm.normal)) return; ISTATE_SET_STATE(norm.hilited, norm.normal); @@ -626,7 +626,7 @@ int ImageclassIsTransparent(ImageClass * ic) { - return ic && ic->norm.normal && ic->norm.normal->transparent; + return (ic) && (ic->norm.normal) && (ic->norm.normal->transparent); } #endif @@ -766,7 +766,7 @@ int xx, yy; bg = DeskGetBackgroundPixmap(DesksGetCurrent()); - if (use_root || bg == None) + if ((use_root) || (bg == None)) { cr = VROOT; bg = WinGetXwin(VROOT); @@ -779,7 +779,7 @@ #if 0 Eprintf("pt_get_bg_image %#lx %d %d %d %d\n", win, xx, yy, w, h); #endif - if (xx < WinGetW(VROOT) && yy < WinGetH(VROOT) && xx + w >= 0 && yy + h >= 0) + if ((xx < WinGetW(VROOT)) && (yy < WinGetH(VROOT)) && (xx + w >= 0) && (yy + h >= 0)) { /* Create the background base image */ ii = EImageGrabDrawable(bg, None, xx, yy, w, h, !EServerIsGrabbed()); @@ -878,7 +878,7 @@ * 0x02: Use root window as base (use only for transients, if at all) * 0x04: Don't apply image mask to result */ - if (is->transparent && EImageHasAlpha(is->im)) + if ((is->transparent) && (EImageHasAlpha(is->im))) flags = is->transparent; if (flags != ICLASS_ATTR_OPAQUE) @@ -903,7 +903,7 @@ pmm->h = h; EImageRenderOnDrawable(ii, win, pmap, 0, 0, 0, w, h); - if ((pmapflags & IC_FLAG_MAKE_MASK) && !(flags & ICLASS_ATTR_NO_CLIP)) + if ((pmapflags & IC_FLAG_MAKE_MASK) && (!(flags & ICLASS_ATTR_NO_CLIP))) { if (EImageHasAlpha(is->im)) { @@ -1097,12 +1097,12 @@ { int w, h; - if (!win || !ic) + if ((!win) || (!ic)) return; w = WinGetW(win); h = WinGetH(win); - if (w <= 0 || h <= 0) + if ((w <= 0) || (h <= 0)) return; if (!is) @@ -1110,7 +1110,7 @@ if (!is) return; - if (tc && text) + if ((tc) && (text)) { if (!ts) ts = TextclassGetTextState(tc, state, active, sticky); @@ -1120,7 +1120,7 @@ ImagestateRealize(is); /* Imlib2 will not render pixmaps with dimensions > 8192 */ - if (is->im && w <= 8192 && h <= 8192) + if ((is->im) && (w <= 8192) && (h <= 8192)) { PmapMask pmm; @@ -1131,7 +1131,7 @@ { Pixmap pmap = pmm.pmap; - if ((ts && text) || (is->bevelstyle != BEVEL_NONE) || + if (((ts) && (text)) || (is->bevelstyle != BEVEL_NONE) || (flags & ITA_BGPMAP)) { if (pmm.type != 0) @@ -1149,7 +1149,7 @@ EXFreeGC(gc); } - if (ts && text) + if ((ts) && (text)) TextstateTextDraw(ts, win, pmap, text, 0, 0, w, h, &(ic->padding), 0, TextclassGetJustification(tc), @@ -1163,7 +1163,7 @@ EFreeWindowBackgroundPixmap(win); } - if (pmm.w == w && pmm.h == h) + if ((pmm.w == w) && (pmm.h == h)) EShapeSetMask(win, 0, 0, pmm.mask); else if (pmm.mask) EShapeSetMaskTiled(win, 0, 0, pmm.mask, w, h); @@ -1181,7 +1181,7 @@ { ImagestateColorsAlloc(is); - if (is->bevelstyle == BEVEL_NONE && !text) + if ((is->bevelstyle == BEVEL_NONE) && (!text)) { ESetWindowBackground(win, is->bg_pixel); } @@ -1191,7 +1191,7 @@ pmap = EGetWindowBackgroundPixmap(win); ImagestateDrawNoImg(is, pmap, 0, 0, w, h); - if (ts && text) + if ((ts) && (text)) TextstateTextDraw(ts, win, pmap, text, 0, 0, w, h, &(ic->padding), 0, TextclassGetJustification(tc), @@ -1257,12 +1257,12 @@ ImagestateRealize(is); /* Imlib2 will not render pixmaps with dimensions > 8192 */ - if (is->im && w <= 8192 && h <= 8192) + if ((is->im) && (w <= 8192) && (h <= 8192)) { ImagestateMakePmapMask(is, win, pmm, pmapflags, w, h, image_type); - if ((pmapflags & IC_FLAG_FULL_SIZE) && pmm->pmap && - (pmm->w != w || pmm->h != h)) + if ((pmapflags & IC_FLAG_FULL_SIZE) && (pmm->pmap) && + ((pmm->w != w) || (pmm->h != h))) { /* Create new full sized pixmaps and fill them with the */ /* pmap and mask tiles */ @@ -1520,7 +1520,7 @@ else st = STATE_NORMAL; - if (w < 0 || h < 0) + if ((w < 0) || (h < 0)) { IpcPrintf("Error: missing width and/or height\n"); return; Index: E16/e/src/icccm.c =================================================================== --- E16/e/src/icccm.c (revision 51690) +++ E16/e/src/icccm.c (working copy) @@ -168,7 +168,7 @@ if (h > ewin->icccm.height_max) h = ewin->icccm.height_max; - if (w <= 0 || h <= 0) + if ((w <= 0) || (h <= 0)) return; w -= ewin->icccm.base_w; @@ -342,7 +342,7 @@ ccmap = EwinGetClientWin(ewin)->cmap; - if (ccmap == ecmap || EoGetWin(ewin)->argb) + if ((ccmap == ecmap) || (EoGetWin(ewin)->argb)) return; /* Hack - assume that if client cmap is default cmap it doesn't have @@ -560,7 +560,7 @@ ecore_x_icccm_name_class_get(EwinGetClientXwin(ewin), &EwinGetIcccmCName(ewin), &EwinGetIcccmClass(ewin)); - if (!EwinGetIcccmCName(ewin) && TryGroup(ewin)) + if ((!EwinGetIcccmCName(ewin)) && (TryGroup(ewin))) ecore_x_icccm_name_class_get(ewin->icccm.group, &EwinGetIcccmCName(ewin), &EwinGetIcccmClass(ewin)); @@ -576,7 +576,7 @@ argc = ecore_x_window_prop_string_list_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_COMMAND, &argv); - if ((argc < 0) && TryGroup(ewin)) + if ((argc < 0) && (TryGroup(ewin))) argc = ecore_x_window_prop_string_list_get(ewin->icccm.group, ECORE_X_ATOM_WM_COMMAND, &argv); @@ -594,7 +594,7 @@ ewin->icccm.wm_machine = ecore_x_window_prop_string_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_CLIENT_MACHINE); - if (!ewin->icccm.wm_machine && TryGroup(ewin)) + if ((!ewin->icccm.wm_machine) && (TryGroup(ewin))) ewin->icccm.wm_machine = ecore_x_window_prop_string_get(ewin->icccm.group, ECORE_X_ATOM_WM_CLIENT_MACHINE); @@ -608,7 +608,7 @@ ewin->icccm.wm_icon_name = ecore_x_window_prop_string_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_ICON_NAME); - if (!ewin->icccm.wm_icon_name && TryGroup(ewin)) + if ((!ewin->icccm.wm_icon_name) && (TryGroup(ewin))) ewin->icccm.wm_icon_name = ecore_x_window_prop_string_get(ewin->icccm.group, ECORE_X_ATOM_WM_ICON_NAME); @@ -649,7 +649,7 @@ WindowGroupHint)) { if ((hint->icon_x == 0) && (hint->icon_y == 0) - && hint->window_group == EwinGetClientXwin(ewin)) + && (hint->window_group == EwinGetClientXwin(ewin))) ewin->state.docked = 1; } } @@ -880,7 +880,7 @@ { long long count; - if (!ewin->ewmh.sync_request_enable || EServerIsGrabbed()) + if ((!ewin->ewmh.sync_request_enable) || (EServerIsGrabbed())) return 0; count = ++ewin->ewmh.sync_request_count; @@ -904,7 +904,7 @@ XSyncWaitCondition xswc[2]; double t; - if (!ewin->ewmh.sync_request_enable || EServerIsGrabbed()) + if ((!ewin->ewmh.sync_request_enable) || (EServerIsGrabbed())) return; xswc[0].trigger.counter = ewin->ewmh.sync_request_counter; Index: E16/e/src/screen.c =================================================================== --- E16/e/src/screen.c (revision 51690) +++ E16/e/src/screen.c (working copy) @@ -62,7 +62,7 @@ screens = EXineramaQueryScreens(&num_screens); Mode.display.xinerama_active = (XineramaIsActive(disp)) ? 1 : 0; - if (!Mode.display.xinerama_active && num_screens > 1) + if ((!Mode.display.xinerama_active) && (num_screens > 1)) Mode.display.xinerama_active = 2; if (num_screens > 1) @@ -86,7 +86,7 @@ scrns = EXineramaQueryScreens(&num); mode = (XineramaIsActive(disp)) ? 1 : 0; - if (!mode && num > 1) + if ((!mode) && (num > 1)) mode = 2; IpcPrintf("Xinerama mode: %s\n", mt[mode]); @@ -144,10 +144,10 @@ { unsigned int i, j; - if (nx > 8 || ny > 8) /* At least some limit */ + if ((nx > 8) || (ny > 8)) /* At least some limit */ return; - if (nx == 0 || ny == 0) + if ((nx == 0) || (ny == 0)) { ScreenInit(); return; @@ -193,7 +193,7 @@ EScreen *ps; int x, y, w, h; - if (head >= 0 && head < n_screens) + if ((head >= 0) && (head < n_screens)) { ps = p_screens + head; x = ps->x; @@ -230,8 +230,8 @@ { ps = p_screens + i; - if (xi >= ps->x && xi < ps->x + ps->w && - yi >= ps->y && yi < ps->y + ps->h) + if ((xi >= ps->x) && (xi < ps->x + ps->w) && + (yi >= ps->y) && (yi < ps->y + ps->h)) { /* Inside - done */ head = i; Index: E16/e/src/eobj.c =================================================================== --- E16/e/src/eobj.c (revision 51690) +++ E16/e/src/eobj.c (working copy) @@ -102,7 +102,7 @@ eo->ilayer = 15; /* Normal */ else if (eo->layer < 0) eo->ilayer = 5; /* Below */ - if (eo->layer > 0 && eo->sticky) + if ((eo->layer > 0) && (eo->sticky)) eo->floating = 1; break; @@ -202,7 +202,7 @@ if (!eo->icccm.wm_name) eo->icccm.wm_name = Estrdup("-?-"); - if (type != EOBJ_TYPE_EWIN && type != EOBJ_TYPE_EXT) + if ((type != EOBJ_TYPE_EWIN) && (type != EOBJ_TYPE_EXT)) HintsSetWindowName(EobjGetWin(eo), eo->icccm.wm_name); #if USE_COMPOSITE @@ -283,7 +283,7 @@ EobjWindowDestroy(EObj * eo) { #if USE_COMPOSITE - if (eo->shown && !eo->inputonly) + if ((eo->shown) && (!eo->inputonly)) EobjUnmap(eo); #endif EobjDestroy(eo); @@ -303,7 +303,7 @@ if (!XGetWindowAttributes(disp, xwin, &attr)) return NULL; - if (type == EOBJ_TYPE_EXT && !attr.override_redirect) + if ((type == EOBJ_TYPE_EXT) && (!attr.override_redirect)) return NULL; win = ERegisterWindow(xwin, &attr); @@ -366,7 +366,7 @@ if (raise) EobjListStackRaise(eo, 0); - if (eo->stacked <= 0 || raise > 1) + if ((eo->stacked <= 0) || (raise > 1)) DeskRestack(eo->desk); if (eo->shaped < 0) @@ -397,8 +397,8 @@ { int move, resize; - move = x != EobjGetX(eo) || y != EobjGetY(eo); - resize = w != EobjGetW(eo) || h != EobjGetH(eo); + move = (x != EobjGetX(eo)) || (y != EobjGetY(eo)); + resize = (w != EobjGetW(eo)) || (h != EobjGetH(eo)); #if USE_COMPOSITE if (eo->type == EOBJ_TYPE_EWIN) { @@ -443,7 +443,7 @@ { int move; - move = x != EobjGetX(eo) || y != EobjGetY(eo); + move = (x != EobjGetX(eo)) || (y != EobjGetY(eo)); EReparentWindow(EobjGetWin(eo), EobjGetWin(dst), x, y); if (dst->type == EOBJ_TYPE_DESK) @@ -485,7 +485,7 @@ if (num < 0) num = EobjListStackRaise(eo, 0); - if (eo->shown && eo->cmhook) + if ((eo->shown) && (eo->cmhook)) ECompMgrWinRaiseLower(eo, num); if (num > 0) num = EobjListStackRaise(eo, 0); @@ -508,7 +508,7 @@ if (num < 0) num = EobjListStackLower(eo, 0); - if (eo->shown && eo->cmhook) + if ((eo->shown) && (eo->cmhook)) ECompMgrWinRaiseLower(eo, num); if (num > 0) num = EobjListStackLower(eo, 0); @@ -532,11 +532,11 @@ eo->shaped = EShapeCheck(EobjGetWin(eo)) != 0; #if USE_COMPOSITE - if (was_shaped <= 0 && eo->shaped <= 0) + if ((was_shaped <= 0) && (eo->shaped <= 0)) return; /* Shape may still be unchanged. Well ... */ - if (eo->shown && eo->cmhook) + if ((eo->shown) && (eo->cmhook)) ECompMgrWinChangeShape(eo); #endif } Index: E16/e/src/dock.c =================================================================== --- E16/e/src/dock.c (revision 51690) +++ E16/e/src/dock.c (working copy) @@ -61,13 +61,13 @@ ewin = lst[i]; /* Skip self and non-dockapps */ - if (ewin == eapp || !ewin->state.docked) + if ((ewin == eapp) || (!ewin->state.docked)) continue; - if ((x + w) <= EoGetX(ewin) || x >= (EoGetX(ewin) + EoGetW(ewin))) + if (((x + w) <= EoGetX(ewin)) || (x >= (EoGetX(ewin) + EoGetW(ewin)))) done = 1; - else if ((y + h) <= EoGetY(ewin) - || y > (EoGetY(ewin) + EoGetH(ewin))) + else if (((y + h) <= EoGetY(ewin)) + || (y > (EoGetY(ewin) + EoGetH(ewin)))) done = 1; else done = 0; @@ -112,7 +112,7 @@ } } - if (x < 0 || y < 0 || x + w > WinGetW(VROOT) || y + h > WinGetH(VROOT)) + if ((x < 0) || (y < 0) || (x + w > WinGetW(VROOT)) || (y + h > WinGetH(VROOT))) { x = WinGetW(VROOT) - w / 2; y = WinGetH(VROOT) - h / 2; Index: E16/e/src/sound.c =================================================================== --- E16/e/src/sound.c (revision 51690) +++ E16/e/src/sound.c (working copy) @@ -144,7 +144,7 @@ { SoundClass *sclass = (SoundClass *) data; - if (!sclass || !sclass->sample) + if ((!sclass) || (!sclass->sample)) return; if (ops) @@ -195,7 +195,7 @@ static void SclassApply(SoundClass * sclass) { - if (!sclass || !Conf_sound.enable) + if ((!sclass) || (!Conf_sound.enable)) return; if (!sclass->sample) @@ -244,7 +244,7 @@ if (!Conf_sound.enable) return; - if (!name || !*name) + if ((!name) || (!*name)) return; sclass = SclassFind(name); @@ -264,7 +264,7 @@ if (!Conf_sound.enable) return; - if (sound <= 0 || sound > N_SOUNDS) + if ((sound <= 0) || (sound > N_SOUNDS)) return; if (_SoundMasked(sound)) @@ -301,7 +301,7 @@ ops = ModLoadSym("sound", "SoundOps", "pa"); #endif #endif - if (ops && ops->Init) + if ((ops) && (ops->Init)) err = ops->Init(); if (err) Index: E16/e/src/moveresize.c =================================================================== --- E16/e/src/moveresize.c (revision 51690) +++ E16/e/src/moveresize.c (working copy) @@ -96,7 +96,7 @@ EWin **gwins; int i, num, cx, cy; - if (!ewin || ewin->state.inhibit_move) + if ((!ewin) || (ewin->state.inhibit_move)) return; _MoveResizeInit(); @@ -120,14 +120,14 @@ Mode_mr.win_y = Mode_mr.start_y - (EoGetY(ewin) + EoGetY(EoGetDesk(ewin))); EwinRaise(ewin); - gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, nogroup - || Mode.move.swap, &num); + gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, (nogroup) + || (Mode.move.swap), &num); - if (Conf.movres.mode_move < 0 || Conf.movres.mode_move > MODE_MOVE_MAX) + if ((Conf.movres.mode_move < 0) || (Conf.movres.mode_move > MODE_MOVE_MAX)) Conf.movres.mode_move = 0; Mode_mr.mode = Conf.movres.mode_move; #if ENABLE_OLDMOVRES - if (num > 1 && Conf.movres.mode_move == 5) + if ((num > 1) && (Conf.movres.mode_move == 5)) Mode_mr.mode = 0; #endif Mode_mr.grab_server = _NeedServerGrab(Mode_mr.mode); @@ -160,7 +160,7 @@ int num, i; Desk *d1, *d2; - if (ewin && ewin != Mode_mr.ewin) + if ((ewin) && (ewin != Mode_mr.ewin)) return; GrabKeyboardRelease(); @@ -174,8 +174,8 @@ ewin->state.show_coords = 0; - gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, Mode_mr.nogroup - || Mode.move.swap, &num); + gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, (Mode_mr.nogroup) + || (Mode.move.swap), &num); if (Mode.mode == MODE_MOVE) { @@ -312,7 +312,7 @@ int x, y, w, h, ww, hh, cx, cy; unsigned int csr; - if (!ewin || ewin->state.inhibit_resize) + if ((!ewin) || (ewin->state.inhibit_resize)) return; _MoveResizeInit(); @@ -324,7 +324,7 @@ SoundPlay(SOUND_RESIZE_START); - if (Conf.movres.mode_resize < 0 || Conf.movres.mode_resize > MOVE_SIZE_MAX) + if ((Conf.movres.mode_resize < 0) || (Conf.movres.mode_resize > MOVE_SIZE_MAX)) Conf.movres.mode_resize = 0; Mode_mr.mode = Conf.movres.mode_resize; Mode_mr.using_kbd = kbd; @@ -455,7 +455,7 @@ static void _MoveResizeResizeEnd(EWin * ewin) { - if (ewin && ewin != Mode_mr.ewin) + if ((ewin) && (ewin != Mode_mr.ewin)) return; Mode.mode = MODE_NONE; @@ -515,7 +515,7 @@ EdgeCheckMotion(Mode.events.mx, Mode.events.my); gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, - Mode_mr.nogroup || Mode.move.swap, &num); + (Mode_mr.nogroup) || (Mode.move.swap), &num); if (Mode.mode == MODE_MOVE_PENDING) { @@ -527,7 +527,7 @@ ModulesSignal(ESIGNAL_ANIMATION_SUSPEND, NULL); } - if (Mode_mr.mode == 0 || num == 1) + if ((Mode_mr.mode == 0) || (num == 1)) ewin->state.show_coords = 1; for (i = 0; i < num; i++) @@ -679,7 +679,7 @@ ewin1->req_y = (jumpy) ? ewin1->shape_y : ewin1->req_y + dy; /* swapping of group member locations: */ - if (Mode.move.swap && GroupsGetSwapmove()) + if ((Mode.move.swap) && (GroupsGetSwapmove())) { EWin **all_gwins, *ewin2; int j, all_gwins_num; @@ -696,17 +696,17 @@ /* check for sufficient overlap and avoid flickering */ if (((ewin1->shape_x >= ewin2->shape_x && - ewin1->shape_x <= ewin2->shape_x + EoGetW(ewin2) / 2 && - dx <= 0) || + (ewin1->shape_x <= ewin2->shape_x + EoGetW(ewin2) / 2) && + (dx <= 0)) || (ewin1->shape_x <= ewin2->shape_x && - ewin1->shape_x + EoGetW(ewin1) / 2 >= ewin2->shape_x && - dx >= 0)) && + (ewin1->shape_x + EoGetW(ewin1) / 2 >= ewin2->shape_x) && + (dx >= 0))) && ((ewin1->shape_y >= ewin2->shape_y && - ewin1->shape_y <= ewin2->shape_y + EoGetH(ewin2) / 2 && - dy <= 0) || + (ewin1->shape_y <= ewin2->shape_y + EoGetH(ewin2) / 2) && + (dy <= 0)) || (EoGetY(ewin1) <= EoGetY(ewin2) && - ewin1->shape_y + EoGetH(ewin1) / 2 >= ewin2->shape_y && - dy >= 0))) + (ewin1->shape_y + EoGetH(ewin1) / 2 >= ewin2->shape_y) && + (dy >= 0)))) { int tmp_swapcoord_x; int tmp_swapcoord_y; @@ -787,8 +787,8 @@ if (!ewin) return; - resize = Mode.mode == MODE_RESIZE || - Mode.mode == MODE_RESIZE_H || Mode.mode == MODE_RESIZE_V; + resize = (Mode.mode == MODE_RESIZE) || + (Mode.mode == MODE_RESIZE_H) || (Mode.mode == MODE_RESIZE_V); Mode.events.px = Mode_mr.cur_x; Mode.events.py = Mode_mr.cur_y; @@ -810,28 +810,28 @@ case XK_Left: if (!RD_H(Mode_mr.resize_detail)) Mode_mr.resize_detail |= RD(1, 0); - if (resize && ewin->icccm.w_inc > delta) + if ((resize) && (ewin->icccm.w_inc > delta)) delta = ewin->icccm.w_inc; Mode_mr.cur_x -= delta; break; case XK_Right: if (!RD_H(Mode_mr.resize_detail)) Mode_mr.resize_detail |= RD(2, 0); - if (resize && ewin->icccm.w_inc > delta) + if ((resize) && (ewin->icccm.w_inc > delta)) delta = ewin->icccm.w_inc; Mode_mr.cur_x += delta; break; case XK_Up: if (!RD_V(Mode_mr.resize_detail)) Mode_mr.resize_detail |= RD(0, 1); - if (resize && ewin->icccm.h_inc > delta) + if ((resize) && (ewin->icccm.h_inc > delta)) delta = ewin->icccm.h_inc; Mode_mr.cur_y -= delta; break; case XK_Down: if (!RD_V(Mode_mr.resize_detail)) Mode_mr.resize_detail |= RD(0, 2); - if (resize && ewin->icccm.h_inc > delta) + if ((resize) && (ewin->icccm.h_inc > delta)) delta = ewin->icccm.h_inc; Mode_mr.cur_y += delta; break; Index: E16/e/src/desktops.c =================================================================== --- E16/e/src/desktops.c (revision 51690) +++ E16/e/src/desktops.c (working copy) @@ -88,9 +88,9 @@ int x[3], y[3], w[3], h[3], m, n, o; const char *t; - if (Conf.desks.dragdir < 0 || Conf.desks.dragdir > 3) + if ((Conf.desks.dragdir < 0) || (Conf.desks.dragdir > 3)) Conf.desks.dragdir = 2; - if (Conf.desks.dragbar_ordering < 0 || Conf.desks.dragbar_ordering > 5) + if ((Conf.desks.dragbar_ordering < 0) || (Conf.desks.dragbar_ordering > 5)) Conf.desks.dragbar_ordering = 1; if (Conf.desks.dragbar_width < 0) Conf.desks.dragbar_width = 0; @@ -371,7 +371,7 @@ Win win; char buf[64]; - if (desk < 0 || desk >= ENLIGHTENMENT_CONF_NUM_DESKTOPS) + if ((desk < 0) || (desk >= ENLIGHTENMENT_CONF_NUM_DESKTOPS)) return NULL; dsk = ECALLOC(Desk, 1); @@ -521,7 +521,7 @@ win = EobjGetWin(dsk->bg.o); - if (dsk->viewable || !dsk->bg.bg) + if ((dsk->viewable) || (!dsk->bg.bg)) { #if USE_COMPOSITE && !USE_BG_WIN_ON_ALL_DESKS if (ECompMgrIsActive()) @@ -535,13 +535,13 @@ if (pmap != None) { ESetWindowBackgroundPixmap(win, pmap); - if (dsk->num == 0 && win != VROOT) + if ((dsk->num == 0) && (win != VROOT)) ESetWindowBackgroundPixmap(VROOT, pmap); } else { ESetWindowBackground(win, pixel); - if (dsk->num == 0 && win != VROOT) + if ((dsk->num == 0) && (win != VROOT)) ESetWindowBackground(VROOT, pixel); } EClearWindow(win); @@ -555,7 +555,7 @@ HintsSetRootInfo(EoGetWin(dsk), None, 0); ESetWindowBackgroundPixmap(win, None); - if (dsk->num == 0 && win != VROOT) + if ((dsk->num == 0) && (win != VROOT)) ESetWindowBackgroundPixmap(VROOT, None); } } @@ -576,7 +576,7 @@ switch (why) { case DESK_BG_REFRESH: - if (bg && dsk->viewable) + if ((bg) && (dsk->viewable)) BackgroundTouch(bg); break; @@ -585,12 +585,12 @@ break; case DESK_BG_TIMEOUT: - if (bg && dsk->viewable) + if ((bg) && (dsk->viewable)) BackgroundTouch(bg); return; case DESK_BG_FREE: - if (!bg || dsk->viewable) + if ((!bg) || (dsk->viewable)) return; break; } @@ -633,14 +633,14 @@ done: dsk->bg.pmap = pmap; - if (reconfigure || pmap != dsk->bg.pmap_set || pixel != dsk->bg.pixel) + if ((reconfigure) || (pmap != dsk->bg.pmap_set) || (pixel != dsk->bg.pixel)) { dsk->bg.pixel = pixel; DeskBackgroundConfigure(dsk); dsk->bg.pmap_set = pmap; } - if (bg && dsk->viewable) + if ((bg) && (dsk->viewable)) if (Conf.hints.set_xroot_info_on_root_window) HintsSetRootInfo(VROOT, pmap, pixel); @@ -655,7 +655,7 @@ return; BackgroundSetForDesk(bg, dsk->num); - if (bg && BackgroundIsNone(bg)) + if ((bg) && (BackgroundIsNone(bg))) bg = NULL; if (dsk->bg.bg != bg) @@ -682,7 +682,7 @@ dsk = _DeskGet(i); if (!dsk) /* May happen during init */ continue; - if (bg && dsk->bg.bg != bg) + if ((bg) && (dsk->bg.bg != bg)) continue; DeskBackgroundRefresh(dsk, why); } @@ -840,7 +840,7 @@ if (quantity >= ENLIGHTENMENT_CONF_NUM_DESKTOPS) quantity = ENLIGHTENMENT_CONF_NUM_DESKTOPS; - if (quantity <= 0 || quantity == Conf.desks.num) + if ((quantity <= 0) || (quantity == Conf.desks.num)) return; for (i = quantity; i < Conf.desks.num; i++) @@ -952,7 +952,7 @@ j = -1; i = 0; - while (j < 0 && i < (int)Conf.desks.num) + while ((j < 0) && (i < (int)Conf.desks.num)) { if (desks.order[i] == dsk->num) j = i; @@ -977,7 +977,7 @@ j = -1; i = 0; - while (j < 0 && i < (int)Conf.desks.num) + while ((j < 0) && (i < (int)Conf.desks.num)) { if (desks.order[i] == dsk->num) j = i; @@ -1002,8 +1002,8 @@ for (i = 0; i < Conf.desks.num; i++) { dsk = _DeskGet(desks.order[i]); - if (x >= EoGetX(dsk) && x < (EoGetX(dsk) + WinGetW(VROOT)) && - y >= EoGetY(dsk) && y < (EoGetY(dsk) + WinGetH(VROOT))) + if ((x >= EoGetX(dsk)) && (x < (EoGetX(dsk) + WinGetW(VROOT))) && + (y >= EoGetY(dsk)) && (y < (EoGetY(dsk) + WinGetH(VROOT)))) return _DeskGet(desks.order[i]); } return _DeskGet(0); @@ -1018,7 +1018,7 @@ for (i = 0; i < Conf.desks.num; i++) { dsk = _DeskGet(i); - if (i && !dsk->viewable) + if ((i) && (!dsk->viewable)) continue; if (!dsk->stack.dirty) continue; @@ -1044,7 +1044,7 @@ n = -1; i = 0; - while (n < 0 && i < Conf.desks.num) + while ((n < 0) && (i < Conf.desks.num)) { if (desks.order[i] == dsk->num) n = i; @@ -1056,7 +1056,7 @@ dx = x - EoGetX(dsk); dy = y - EoGetY(dsk); - if (x == 0 && y == 0) + if ((x == 0) && (y == 0)) { /* Desks below are obscured - touch and set unviewable */ for (i = n + 1; i < Conf.desks.num; i++) @@ -1074,19 +1074,19 @@ for (i = n + 1; i < Conf.desks.num; i++) { dd = _DeskGet(desks.order[i]); - if (!dd->viewable && v) + if ((!dd->viewable) && (v)) { dd->viewable = 1; DeskBackgroundRefresh(_DeskGet(desks.order[i]), DESK_BG_REFRESH); } - else if (dd->viewable && !v) + else if ((dd->viewable) && (!v)) { BackgroundTouch(dd->bg.bg); dd->viewable = 0; } - if (EoGetX(dd) == 0 && EoGetY(dd) == 0) + if ((EoGetX(dd) == 0) && (EoGetY(dd) == 0)) v = 0; } } @@ -1111,7 +1111,7 @@ { Desk *dsk; - if (desk <= 0 || desk >= Conf.desks.num) + if ((desk <= 0) || (desk >= Conf.desks.num)) return; dsk = _DeskGet(desk); @@ -1157,7 +1157,7 @@ if (Conf.desks.desks_wraparound) desk %= Conf.desks.num; - if (desk >= Conf.desks.num || desk == desks.current->num) + if ((desk >= Conf.desks.num) || (desk == desks.current->num)) return; dsk = _DeskGet(desk); @@ -1179,7 +1179,7 @@ void DeskGoto(Desk * dsk) { - if (!dsk || dsk == desks.previous) + if ((!dsk) || (dsk == desks.previous)) return; if (EDebug(EDBUG_TYPE_DESKS)) @@ -1448,7 +1448,7 @@ void DeskGotoByEwin(EWin * ewin) { - if (EoIsSticky(ewin) || EoIsFloating(ewin)) + if ((EoIsSticky(ewin)) || (EoIsFloating(ewin))) return; DeskGoto(EoGetDesk(ewin)); @@ -1612,7 +1612,7 @@ ewin = lst[i]; /* Disable if there are non-sticky shading windows */ - if (EoIsSticky(ewin) || ewin->state.iconified) + if ((EoIsSticky(ewin)) || (ewin->state.iconified)) continue; if (ewin->state.shading) return 1; @@ -1637,7 +1637,7 @@ DesksFixArea(&ax, &ay); DeskCurrentGetArea(&pax, &pay); - if (ax == pax && ay == pay) + if ((ax == pax) && (ay == pay)) return; if (EDebug(EDBUG_TYPE_DESKS)) @@ -1677,12 +1677,12 @@ for (i = 0; i < num; i++) { ewin = lst[i]; - if (EoIsSticky(ewin) || ewin->state.iconified) + if ((EoIsSticky(ewin)) || (ewin->state.iconified)) continue; - if (EoGetDesk(ewin) != DesksGetCurrent() && !EoIsFloating(ewin)) + if ((EoGetDesk(ewin) != DesksGetCurrent()) && (!EoIsFloating(ewin))) continue; - if (EoIsFloating(ewin) && Conf.movres.mode_move == 0) + if ((EoIsFloating(ewin)) && (Conf.movres.mode_move == 0)) continue; wnum++; @@ -1706,12 +1706,12 @@ ewin = lst[i]; if (EwinIsTransientChild(ewin)) continue; - if (EoGetDesk(ewin) != DesksGetCurrent() && !EoIsFloating(ewin)) + if ((EoGetDesk(ewin) != DesksGetCurrent()) && (!EoIsFloating(ewin))) continue; - if (EoIsSticky(ewin) || - (EoIsFloating(ewin) && Conf.movres.mode_move == 0) || - (!ewin->state.iconified && Conf.desks.slidein)) + if ((EoIsSticky(ewin)) || + ((EoIsFloating(ewin)) && (Conf.movres.mode_move == 0)) || + ((!ewin->state.iconified) && (Conf.desks.slidein))) EwinMove(ewin, EoGetX(ewin), EoGetY(ewin)); else EwinMove(ewin, EoGetX(ewin) - dx, EoGetY(ewin) - dy); @@ -1885,20 +1885,20 @@ if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskRootResize %d %dx%d\n", root, w, h); - if (root && (VROOT != RROOT)) + if ((root) && (VROOT != RROOT)) { WinGetW(RROOT) = w; WinGetH(RROOT) = h; } /* Quit if no change */ - if (w == WinGetW(VROOT) && h == WinGetH(VROOT)) + if ((w == WinGetW(VROOT)) && (h == WinGetH(VROOT))) return; EWindowSync(VROOT); /* Quit if size is not final */ - if (w != WinGetW(VROOT) || h != WinGetH(VROOT)) + if ((w != WinGetW(VROOT)) || (h != WinGetH(VROOT))) return; ScreenInit(); @@ -2014,7 +2014,7 @@ pd = Conf.desks.dragdir; - if (params && params[0]) + if ((params) && (params[0])) Conf.desks.dragdir = atoi(params); else { @@ -2041,7 +2041,7 @@ pd = Conf.desks.dragbar_ordering; - if (params && params[0]) + if ((params) && (params[0])) Conf.desks.dragbar_ordering = atoi(params); else { @@ -2676,7 +2676,7 @@ desk = DesksGetCurrentNum(); - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { IpcPrintf("Current Desktop: %d/%d\n", desk, Conf.desks.num); } @@ -2769,7 +2769,7 @@ DeskCurrentGetArea(&ax, &ay); - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { IpcPrintf("Current Area: %d %d\n", ax, ay); } Index: E16/e/src/pager.c =================================================================== --- E16/e/src/pager.c (revision 51690) +++ E16/e/src/pager.c (working copy) @@ -174,7 +174,7 @@ static void PagerScanTrig(Pager * p) { - if (p->scan_timer || Conf_pagers.scanspeed <= 0) + if ((p->scan_timer) || (Conf_pagers.scanspeed <= 0)) return; TIMER_ADD(p->scan_timer, 1 / ((double)Conf_pagers.scanspeed), @@ -202,7 +202,7 @@ goto nomore; ewin = p->ewin; - if (!ewin || !EoIsShown(ewin)) + if ((!ewin) || (!EoIsShown(ewin))) goto nomore; if (p->dsk != DesksGetCurrent()) goto nomore; @@ -221,7 +221,7 @@ xx = cx * ww; yy = cy * hh; phase = p->update_phase; - if (ww <= 0 || hh <= 0) + if ((ww <= 0) || (hh <= 0)) goto nomore; #if 0 @@ -294,11 +294,11 @@ update = 0; if (!ewin->mini_pmm.pmap) update = 1; - if (ewin->mini_w != w || ewin->mini_h != h) + if ((ewin->mini_w != w) || (ewin->mini_h != h)) update = 1; - if (serdif > 0 && ewin->type != EWIN_TYPE_PAGER && - pager_mode == PAGER_MODE_LIVE && Mode.mode == 0) + if ((serdif > 0) && (ewin->type != EWIN_TYPE_PAGER) && + (pager_mode == PAGER_MODE_LIVE) && (Mode.mode == 0)) update = 1; if (serdif > p->serdif) p->serdif = serdif; @@ -323,7 +323,7 @@ if (pager_mode != PAGER_MODE_SIMPLE) { draw = EoGetPixmap(ewin); - if (draw == None && EwinIsOnScreen(ewin)) + if ((draw == None) && (EwinIsOnScreen(ewin))) draw = EoGetXwin(ewin); } use_iclass = draw == None; @@ -371,17 +371,17 @@ vy = cy * WinGetH(VROOT); update_screen_included = update_screen_only = 0; - if (pager_mode == PAGER_MODE_SNAP && p->dsk == DesksGetCurrent() - && Mode.mode == 0) + if ((pager_mode == PAGER_MODE_SNAP) && (p->dsk == DesksGetCurrent()) + && (Mode.mode == 0)) { /* Update from screen unless update area is entirely off-screen */ - if (!(p->x2 <= vx || p->y2 <= vy || - p->x1 >= vx + WinGetW(VROOT) || p->y1 >= vy + WinGetH(VROOT))) + if (!((p->x2 <= vx) || (p->y2 <= vy) || + (p->x1 >= vx + WinGetW(VROOT)) || (p->y1 >= vy + WinGetH(VROOT)))) update_screen_included = 1; /* Check if update area is entirely on-screen */ - if (p->x1 >= vx && p->y1 >= vy && - p->x2 <= vx + WinGetW(VROOT) && p->y2 <= vy + WinGetH(VROOT)) + if ((p->x1 >= vx) && (p->y1 >= vy) && + (p->x2 <= vx + WinGetW(VROOT)) && (p->y2 <= vy + WinGetH(VROOT))) update_screen_only = 1; } p->x1 = p->y1 = 99999; @@ -588,7 +588,7 @@ pmap = p->bgpmap = ECreatePixmap(p->win, p->dw, p->dh, 0); bg = DeskBackgroundGet(p->dsk); - if (pager_mode != PAGER_MODE_SIMPLE && bg) + if ((pager_mode != PAGER_MODE_SIMPLE) && (bg)) { #if USE_PAGER_BACKGROUND_CACHE char s[4096]; @@ -619,7 +619,7 @@ return; } - if (pager_mode != PAGER_MODE_SIMPLE && p->dsk->bg.pmap) + if ((pager_mode != PAGER_MODE_SIMPLE) && (p->dsk->bg.pmap)) { ScaleTile(VROOT, p->dsk->bg.pmap, p->win, pmap, 0, 0, p->dw, p->dh, HIQ); @@ -677,12 +677,12 @@ int ax, ay, cx, cy; ImageClass *ic; - if (!Conf_pagers.enable || !p || Mode.mode != MODE_NONE) + if ((!Conf_pagers.enable) || (!p) || (Mode.mode != MODE_NONE)) return; w = ewin->client.w; h = ewin->client.h; - if ((w == p->w && h == p->h) || w <= 1 || h <= 1) + if (((w == p->w) && (h == p->h)) || (w <= 1) || (h <= 1)) return; DesksGetAreaSize(&ax, &ay); @@ -692,7 +692,7 @@ p->dw = w / ax; p->dh = h / ay; - if (p->scale <= 0. || Mode.op_source == OPSRC_USER) + if ((p->scale <= 0.) || (Mode.op_source == OPSRC_USER)) p->scale = ((float)WinGetW(VROOT) / p->dw + (float)WinGetH(VROOT) / p->dh) / 2; @@ -785,7 +785,7 @@ Pager *p = (Pager *) item; pager_foreach_data *data = (pager_foreach_data *) prm; - if (data->dsk && data->dsk != p->dsk) + if ((data->dsk) && (data->dsk != p->dsk)) return; data->func(p, data->prm); } @@ -860,7 +860,7 @@ double t, dt; Timer *pager_update_timer; - if (!Mode_pagers.update_pending || !Conf_pagers.enable) + if ((!Mode_pagers.update_pending) || (!Conf_pagers.enable)) return; if (Mode_pagers.update_pending == (1 << PAGER_UPD_EWIN_DAMAGE)) @@ -895,7 +895,7 @@ int x, y, w, h; static GC gc = 0; - if (!EoIsShown(ewin) || !EwinIsOnScreen(ewin)) + if ((!EoIsShown(ewin)) || (!EwinIsOnScreen(ewin))) return; Dprintf("PagerEwinUpdateFromPager %d\n", p->dsk->num); @@ -918,7 +918,7 @@ /* NB! If the pixmap/mask was created by imlib, free it. Due to imlibs */ /* image/pixmap cache it may be in use elsewhere. */ - if (ewin->mini_pmm.pmap && + if ((ewin->mini_pmm.pmap) && ((ewin->mini_pmm.type) || (ewin->mini_w != w) || (ewin->mini_h != h))) FreePmapMask(&ewin->mini_pmm); @@ -965,7 +965,7 @@ switch (why) { case PAGER_UPD_EWIN_GEOM: - if (!EoIsShown(ewin) || ewin->state.animated) + if ((!EoIsShown(ewin)) || (ewin->state.animated)) return; break; @@ -1008,7 +1008,7 @@ w = (EoGetW(ewin) * p->dw) / WinGetW(VROOT); h = (EoGetH(ewin) * p->dh) / WinGetH(VROOT); - if (px >= x && py >= y && px < (x + w) && py < (y + h)) + if ((px >= x) && (py >= y) && (px < (x + w)) && (py < (y + h))) return ewin; } @@ -1131,7 +1131,7 @@ Dprintf("PagerShowTt %s\n", (ewin) ? EwinGetIconName(ewin) : NULL); - if (!Conf_pagers.title || (ewin == tt_ewin)) + if ((!Conf_pagers.title) || (ewin == tt_ewin)) return; if (MenusActive()) /* Don't show Tooltip when menu is up */ @@ -1191,7 +1191,7 @@ if (MenusActive()) /* Don't show HiWin when menu is up */ return; - if (!phi || ewin) + if ((!phi) || (ewin)) { PagerHiwinInit(p, ewin); phi = hiwin; @@ -1212,7 +1212,7 @@ if (delta > 0) { - if (!ECompMgrIsActive() && Mode_pagers.zoom >= 2) + if ((!ECompMgrIsActive()) && (Mode_pagers.zoom >= 2)) return; if (Mode_pagers.zoom >= 8) return; @@ -1235,7 +1235,7 @@ if (!Conf_pagers.enable) return; - if (Mode.events.on_screen && x >= 0 && x < p->w && y >= 0 && y < p->h) + if ((Mode.events.on_screen) && (x >= 0) && (x < p->w) && (y >= 0) && (y < p->h)) ewin = EwinInPagerAt(p, x, y); else ewin = NULL; @@ -1246,11 +1246,11 @@ return; } - if (!ewin || EoGetLayer(ewin) <= 0) + if ((!ewin) || (EoGetLayer(ewin) <= 0)) { PagerHiwinHide(); } - else if (!hiwin || ewin != HiwinGetEwin(hiwin, 0)) + else if ((!hiwin) || (ewin != HiwinGetEwin(hiwin, 0))) { if (Mode_pagers.zoom < 2) Mode_pagers.zoom = 2; @@ -1332,7 +1332,7 @@ PagersUpdateBackground(NULL); - if (Conf_pagers.mode == PAGER_MODE_SNAP && Conf_pagers.scanspeed > 0) + if ((Conf_pagers.mode == PAGER_MODE_SNAP) && (Conf_pagers.scanspeed > 0)) PagersForeach(DesksGetCurrent(), _PagerSetSnap, NULL); autosave(); @@ -1422,7 +1422,7 @@ dx = Mode.events.mx - Mode.events.px; dy = Mode.events.my - Mode.events.py; - if (dx == 0 && dy == 0 && p == pd) + if ((dx == 0) && (dy == 0) && (p == pd)) return; /* Move mini window */ @@ -1448,7 +1448,7 @@ Dprintf("%s m=%d d=%d x,y=%d,%d\n", __func__, Mode.mode, p->dsk->num, px, py); - in_pager = (px >= 0 && py >= 0 && px < p->w && py < p->h); + in_pager = ((px >= 0) && (py >= 0) && (px < p->w) && (py < p->h)); if (!in_pager) return; @@ -1460,7 +1460,7 @@ else if (button == Conf_pagers.win_button) { ewin = EwinInPagerAt(p, px, py); - if (ewin && ewin->type != EWIN_TYPE_PAGER && !ewin->state.inhibit_move) + if ((ewin) && (ewin->type != EWIN_TYPE_PAGER) && (!ewin->state.inhibit_move)) { PagerHiwinShow(p, ewin, 1, !Mode.wm.window); Mode.mode = MODE_PAGER_DRAG_PENDING; @@ -1480,7 +1480,7 @@ Dprintf("%s m=%d d=%d x,y=%d,%d\n", __func__, Mode.mode, p->dsk->num, px, py); - in_pager = (px >= 0 && py >= 0 && px < p->w && py < p->h); + in_pager = ((px >= 0) && (py >= 0) && (px < p->w) && (py < p->h)); if (button == Conf_pagers.sel_button) { @@ -1517,8 +1517,8 @@ /* Finish pager drag */ - in_vroot = (Mode.events.cx >= 0 && Mode.events.cx < WinGetW(VROOT) && - Mode.events.cy >= 0 && Mode.events.cy < WinGetH(VROOT)); + in_vroot = ((Mode.events.cx >= 0) && (Mode.events.cx < WinGetW(VROOT)) && + (Mode.events.cy >= 0) && (Mode.events.cy < WinGetH(VROOT))); /* Find which pager or iconbox we are in (if any) */ ewin2 = GetEwinPointerInClient(); @@ -1543,7 +1543,7 @@ } Efree(gwins); } - else if (ewin2 && ewin2->props.vroot) + else if ((ewin2) && (ewin2->props.vroot)) { /* Dropping onto virtual root */ EwinReparent(ewin, EwinGetClientWin(ewin2)); @@ -1676,7 +1676,7 @@ case MODE_PAGER_DRAG_PENDING: case MODE_PAGER_DRAG: ewin = HiwinGetEwin(hiwin, 1); - if (!ewin || ewin->type == EWIN_TYPE_PAGER) + if ((!ewin) || (ewin->type == EWIN_TYPE_PAGER)) { Mode.mode = MODE_NONE; break; @@ -1737,7 +1737,7 @@ { unsigned int i; - if (enable && !Conf_pagers.enable) + if ((enable) && (!Conf_pagers.enable)) { Conf_pagers.enable = 1; for (i = 0; i < DesksGetNumber(); i++) @@ -1745,7 +1745,7 @@ UpdatePagerSel(); Mode_pagers.idler = IdlerAdd(_PagersIdler, NULL); } - else if (!enable && Conf_pagers.enable) + else if ((!enable) && (Conf_pagers.enable)) { for (i = 0; i < DesksGetNumber(); i++) PagersForDesktopDisable(DeskGet(i)); Index: E16/e/src/grabs.c =================================================================== --- E16/e/src/grabs.c (revision 51690) +++ E16/e/src/grabs.c (working copy) @@ -108,7 +108,7 @@ for (i = 0; i < 8; i++) { - if (i && !Mode.masks.mod_combos[i]) + if ((i) && (!Mode.masks.mod_combos[i])) continue; XGrabButton(disp, button, modifiers | Mode.masks.mod_combos[i], WinGetXwin(win), owner_events, event_mask, pointer_mode, @@ -129,7 +129,7 @@ for (i = 0; i < 8; i++) { - if (i && !Mode.masks.mod_combos[i]) + if ((i) && (!Mode.masks.mod_combos[i])) continue; XUngrabButton(disp, button, modifiers | Mode.masks.mod_combos[i], WinGetXwin(win)); @@ -153,7 +153,7 @@ for (i = 0; i < 8; i++) { - if (i && !Mode.masks.mod_combos[i]) + if ((i) && (!Mode.masks.mod_combos[i])) continue; XGrabKey(disp, key, modifiers | Mode.masks.mod_combos[i], WinGetXwin(win), owner_events, pointer_mode, keyboard_mode); @@ -173,7 +173,7 @@ for (i = 0; i < 8; i++) { - if (i && !Mode.masks.mod_combos[i]) + if ((i) && (!Mode.masks.mod_combos[i])) continue; XUngrabKey(disp, key, modifiers | Mode.masks.mod_combos[i], WinGetXwin(win)); Index: E16/e/src/iconify.c =================================================================== --- E16/e/src/iconify.c (revision 51690) +++ E16/e/src/iconify.c (working copy) @@ -234,10 +234,10 @@ static void IB_Animate(Container * ct, int iconify, EWin * ewin) { - if (Mode.wm.startup || ct->anim_mode <= 0) + if ((Mode.wm.startup) || (ct->anim_mode <= 0)) return; - if (Conf_containers.anim_time < 10 || Conf_containers.anim_time > 10000) + if ((Conf_containers.anim_time < 10) || (Conf_containers.anim_time > 10000)) Conf_containers.anim_time = 250; EobjsRepaint(); @@ -303,7 +303,7 @@ SoundPlay(SOUND_ICONIFY); - if (EoIsShown(ewin) && ct->anim_mode && !ewin->state.showingdesk) + if ((EoIsShown(ewin)) && (ct->anim_mode) && (!ewin->state.showingdesk)) IB_Animate(ct, 1, ewin); IconboxObjEwinAdd(ct, ewin); @@ -320,7 +320,7 @@ SoundPlay(SOUND_DEICONIFY); - if (ct->anim_mode && !ewin->state.showingdesk) + if ((ct->anim_mode) && (!ewin->state.showingdesk)) IB_Animate(ct, 0, ewin); IconboxObjEwinDel(ct, ewin); @@ -379,7 +379,7 @@ for (i = 0; i < num; i++) { ct = lst[i]; - if (!ct->ewin || ct->type != IB_TYPE_ICONBOX) + if ((!ct->ewin) || (ct->type != IB_TYPE_ICONBOX)) continue; dx = (EoGetX(ct->ewin) + (EoGetW(ct->ewin) / 2)) - @@ -450,7 +450,7 @@ minsz = (size * 3) / 4; - if (maxwh < minsz || maxwh > size) + if ((maxwh < minsz) || (maxwh > size)) { w = (w * size) / maxwh; h = (h * size) / maxwh; Index: E16/e/src/ewin-ops.c =================================================================== --- E16/e/src/ewin-ops.c (revision 51690) +++ E16/e/src/ewin-ops.c (working copy) @@ -145,7 +145,7 @@ DesksFixArea(&ax, &ay); } - if (ax != ewin->area_x || ay != ewin->area_y) + if ((ax != ewin->area_x) || (ay != ewin->area_y)) { ewin->area_x = ax; ewin->area_y = ay; @@ -202,7 +202,7 @@ floating = 0; flags |= MRF_RAISE; } - else if (EoIsSticky(ewin) && !floating) + else if ((EoIsSticky(ewin)) && (!floating)) { dsk = DesksGetCurrent(); } @@ -217,7 +217,7 @@ flags |= MRF_DESK; } - if (Mode.mode == MODE_NONE && Mode.move.check) + if ((Mode.mode == MODE_NONE) && (Mode.move.check)) { /* Don't throw windows offscreen */ sw = WinGetW(VROOT); @@ -284,7 +284,7 @@ w = 32000; if (h > 32000) h = 32000; - if (ewin->ops && ewin->ops->Layout) + if ((ewin->ops) && (ewin->ops->Layout)) { ewin->ops->Layout(ewin, &x, &y, &w, &h); } @@ -329,7 +329,7 @@ Eprintf("repa=%d float=%d raise=%d move=%d resz=%d\n", reparent, floating, raise, move, resize); #endif - if (EoIsShown(ewin) && (move || reparent)) + if ((EoIsShown(ewin)) && ((move) || (reparent))) ModulesSignal(ESIGNAL_EWIN_CHANGE, ewin); if (reparent) @@ -344,7 +344,7 @@ } configure = 0; - if (Mode.mode == MODE_NONE || resize || Conf.movres.update_while_moving) + if ((Mode.mode == MODE_NONE) || (resize) || (Conf.movres.update_while_moving)) { configure = 1; #if USE_XSYNC @@ -370,16 +370,16 @@ EwinBorderCalcSizes(ewin, 0); /* Clear maximized state on resize */ - if (resize && !ewin->state.maximizing && !ewin->state.shading) + if ((resize) && (!ewin->state.maximizing) && (!ewin->state.shading)) { - if (ewin->state.maximized_horz || ewin->state.maximized_vert) + if ((ewin->state.maximized_horz) || (ewin->state.maximized_vert)) { ewin->state.maximized_horz = 0; ewin->state.maximized_vert = 0; HintsSetWindowState(ewin); } } - if (resize && ewin->state.shaped) + if ((resize) && (ewin->state.shaped)) ewin->update.shape = 1; } @@ -417,7 +417,7 @@ EwinSetPlacementGravity(ewin, x, y); if ((flags & (MRF_DESK | MRF_MOVE | MRF_RESIZE)) && - ewin->ops && ewin->ops->MoveResize) + (ewin->ops) && (ewin->ops->MoveResize)) ewin->ops->MoveResize(ewin, resize); if (Mode.mode == MODE_NONE) @@ -568,7 +568,7 @@ EwinIconify(e); } #if ENABLE_GNOME - if (lst && call_depth == 1) + if ((lst) && (call_depth == 1)) GNOME_SetClientList(); #endif Efree(lst); @@ -591,9 +591,9 @@ { item = lst[i]; - if (item == ewin || EwinIsTransient(item) || - item->state.iconified || item->state.donthide || - item->area_x != ewin->area_x || item->area_y != ewin->area_y) + if ((item == ewin) || (EwinIsTransient(item)) || + (item->state.iconified) || (item->state.donthide) || + (item->area_x != ewin->area_x) || (item->area_y != ewin->area_y)) continue; EwinIconify(item); } @@ -604,8 +604,8 @@ { int dx, dy; - if (x + w > 4 && x <= WinGetW(VROOT) - 4 && - y + h > 4 && y <= WinGetH(VROOT) - 4) + if ((x + w > 4) && (x <= WinGetW(VROOT) - 4) && + (y + h > 4) && (y <= WinGetH(VROOT) - 4)) goto done; dx = w / 2; @@ -636,7 +636,7 @@ return; call_depth++; - if (ewin->state.state != EWIN_STATE_ICONIC || !ewin->state.iconified) + if ((ewin->state.state != EWIN_STATE_ICONIC) || (!ewin->state.iconified)) return; EwinRememberPositionGet(ewin, DesksGetCurrent(), &x, &y); @@ -663,7 +663,7 @@ EwinDeIconify1(e, dx, dy); } #if ENABLE_GNOME - if (lst && call_depth == 1) + if ((lst) && (call_depth == 1)) GNOME_SetClientList(); #endif Efree(lst); @@ -753,7 +753,7 @@ return; if (ewin->state.zoomed) return; - if (ewin->state.shaded && !force) + if ((ewin->state.shaded) && (!force)) return; x = EoGetX(ewin); @@ -1038,7 +1038,7 @@ return; if (ewin->state.zoomed) return; - if (ewin->state.shaded || ewin->state.shading || ewin->state.iconified) + if ((ewin->state.shaded) || (ewin->state.shading) || (ewin->state.iconified)) return; if ((ewin->border) && (!strcmp(ewin->border->name, "BORDERLESS"))) return; @@ -1261,7 +1261,7 @@ if (ewin->state.zoomed) return; TIMER_DEL(ewin->timer); - if (!ewin->state.shaded || ewin->state.shading || ewin->state.iconified) + if ((!ewin->state.shaded) || (ewin->state.shading) || (ewin->state.iconified)) return; SoundPlay(SOUND_UNSHADE); @@ -1317,7 +1317,7 @@ /* Fixup if available space doesn't match ICCCM size constraints */ ICCCM_SizeMatch(ewin, w, h, &ww, &hh); - if (w == ww && h == hh) + if ((w == ww) && (h == hh)) { b = BorderFind("BORDERLESS"); } @@ -1392,8 +1392,8 @@ { ewin = lst[i]; - if (EwinIsTransient(ewin) || - ewin->state.iconified || ewin->state.donthide) + if ((EwinIsTransient(ewin)) || + (ewin->state.iconified) || (ewin->state.donthide)) continue; ewin->state.showingdesk = 1; @@ -1429,12 +1429,12 @@ { int unshade; - if (source == OPSRC_APP && EwinInhGetApp(ewin, focus)) + if ((source == OPSRC_APP) && (EwinInhGetApp(ewin, focus))) return; unshade = ewin->state.shaded /* && !ewin->state.iconified */ ; - if (!ewin->state.animated && !ewin->state.iconified) + if ((!ewin->state.animated) && (!ewin->state.iconified)) DeskGotoByEwin(ewin); if (raise) EwinOpRaise(ewin, source); Index: E16/e/src/extinitwin.c =================================================================== --- E16/e/src/extinitwin.c (revision 51690) +++ E16/e/src/extinitwin.c (working copy) @@ -328,7 +328,7 @@ void ExtInitWinKill(void) { - if (!disp || init_win_ext == None) + if ((!disp) || (init_win_ext == None)) return; if (EDebug(EDBUG_TYPE_SESSION)) Index: E16/e/src/edge.c =================================================================== --- E16/e/src/edge.c (revision 51690) +++ E16/e/src/edge.c (working copy) @@ -50,7 +50,7 @@ /* Quit if in fullscreen window */ ewin = GetEwinPointerInClient(); - if (ewin && ewin->state.fullscreen) + if ((ewin) && (ewin->state.fullscreen)) goto done; DeskCurrentGetArea(&ax, &ay); @@ -63,25 +63,25 @@ switch (val) { case 0: - if (ax == 0 && !Conf.desks.areas_wraparound) + if ((ax == 0) && (!Conf.desks.areas_wraparound)) goto done; dx = WinGetW(VROOT) - 2; dax = -1; break; case 1: - if (ax == (aw - 1) && !Conf.desks.areas_wraparound) + if ((ax == (aw - 1)) && (!Conf.desks.areas_wraparound)) goto done; dx = -(WinGetW(VROOT) - 2); dax = 1; break; case 2: - if (ay == 0 && !Conf.desks.areas_wraparound) + if ((ay == 0) && (!Conf.desks.areas_wraparound)) goto done; dy = WinGetH(VROOT) - 2; day = -1; break; case 3: - if (ay == (ah - 1) && !Conf.desks.areas_wraparound) + if ((ay == (ah - 1)) && (!Conf.desks.areas_wraparound)) goto done; dy = -(WinGetH(VROOT) - 2); day = 1; @@ -115,10 +115,10 @@ #if 0 Eprintf("EdgeEvent %d -> %d\n", lastdir, dir); #endif - if (lastdir == dir || Conf.desks.edge_flip_mode == EDGE_FLIP_OFF) + if ((lastdir == dir) || (Conf.desks.edge_flip_mode == EDGE_FLIP_OFF)) return; - if (Conf.desks.edge_flip_mode == EDGE_FLIP_MOVE && Mode.mode != MODE_MOVE) + if ((Conf.desks.edge_flip_mode == EDGE_FLIP_MOVE) && (Mode.mode != MODE_MOVE)) return; TIMER_DEL(edge_timer); @@ -250,10 +250,10 @@ DeskCurrentGetArea(&cx, &cy); DesksGetAreaSize(&ax, &ay); - EdgeWindowShow(1, cx != 0 || Conf.desks.areas_wraparound); - EdgeWindowShow(2, cx != (ax - 1) || Conf.desks.areas_wraparound); - EdgeWindowShow(3, cy != 0 || Conf.desks.areas_wraparound); - EdgeWindowShow(4, cy != (ay - 1) || Conf.desks.areas_wraparound); + EdgeWindowShow(1, (cx != 0) || (Conf.desks.areas_wraparound)); + EdgeWindowShow(2, (cx != (ax - 1)) || (Conf.desks.areas_wraparound)); + EdgeWindowShow(3, (cy != 0) || (Conf.desks.areas_wraparound)); + EdgeWindowShow(4, (cy != (ay - 1)) || (Conf.desks.areas_wraparound)); } void Index: E16/e/src/alert.c =================================================================== --- E16/e/src/alert.c (revision 51690) +++ E16/e/src/alert.c (working copy) @@ -257,19 +257,19 @@ win = XCreateWindow(dd, DefaultRootWindow(dd), -100, -100, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, mask, &att); - if (str1 && sscanf(str1, "%s", line) > 0) + if ((str1) && (sscanf(str1, "%s", line) > 0)) { b1 = XCreateWindow(dd, win, -100, -100, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, mask, &att); XMapWindow(dd, b1); } - if (str2 && sscanf(str2, "%s", line) > 0) + if ((str2) && (sscanf(str2, "%s", line) > 0)) { b2 = XCreateWindow(dd, win, -100, -100, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, mask, &att); XMapWindow(dd, b2); } - if (str3 && sscanf(str3, "%s", line) > 0) + if ((str3) && (sscanf(str3, "%s", line) > 0)) { b3 = XCreateWindow(dd, win, -100, -100, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, mask, &att); @@ -351,21 +351,21 @@ } mh += 10; - if (str1 && sscanf(str1, "%s", line) > 0) + if ((str1) && (sscanf(str1, "%s", line) > 0)) { w = 5 + (((ww - 20 - mh) * 0) / 4); XMoveResizeWindow(dd, b1, w, hh - 15 - fh, mh + 10, fh + 10); XSelectInput(dd, b1, ButtonPressMask | ButtonReleaseMask | ExposureMask); } - if (str2 && sscanf(str2, "%s", line) > 0) + if ((str2) && (sscanf(str2, "%s", line) > 0)) { w = 5 + (((ww - 20 - mh) * 1) / 2); XMoveResizeWindow(dd, b2, w, hh - 15 - fh, mh + 10, fh + 10); XSelectInput(dd, b2, ButtonPressMask | ButtonReleaseMask | ExposureMask); } - if (str3 && sscanf(str3, "%s", line) > 0) + if ((str3) && (sscanf(str3, "%s", line) > 0)) { w = 5 + (((ww - 20 - mh) * 2) / 2); XMoveResizeWindow(dd, b3, w, hh - 15 - fh, mh + 10, fh + 10); @@ -476,7 +476,7 @@ k += fh + 2; } } - if (str1 && sscanf(str1, "%s", line) > 0) + if ((str1) && (sscanf(str1, "%s", line) > 0)) { ExTextExtents(xfs, str1, strlen(str1), &rect1, &rect2); h = rect2.width; @@ -486,7 +486,7 @@ DRAW_THIN_BOX_IN(dd, gc, win, w, hh - 17 - fh, mh + 14, fh + 14); } - if (str2 && sscanf(str2, "%s", line) > 0) + if ((str2) && (sscanf(str2, "%s", line) > 0)) { ExTextExtents(xfs, str2, strlen(str2), &rect1, &rect2); h = rect2.width; @@ -496,7 +496,7 @@ DRAW_THIN_BOX_IN(dd, gc, win, w, hh - 17 - fh, mh + 14, fh + 14); } - if (str3 && sscanf(str3, "%s", line) > 0) + if ((str3) && (sscanf(str3, "%s", line) > 0)) { ExTextExtents(xfs, str3, strlen(str3), &rect1, &rect2); h = rect2.width; Index: E16/e/src/econfig.c =================================================================== --- E16/e/src/econfig.c (revision 51690) +++ E16/e/src/econfig.c (working copy) @@ -96,7 +96,7 @@ len = 0; i = sscanf(s, "%100s = %n", key, &len); - if (i <= 0 || len <= 0) + if ((i <= 0) || (len <= 0)) continue; /* Ignore bad format */ i = ecf->nitms++; @@ -169,7 +169,7 @@ return; value = (ecf) ? ECfgFileFindValue(ecf, name) : NULL; - if (value || dflt) + if ((value) || (dflt)) CfgItemSetFromString(ci, value, 1); } @@ -214,7 +214,7 @@ ecf = e16_db_open_read(file); /* NB! We have to assign the defaults even if it doesn't exist */ - if (!ecf && !dflt) + if ((!ecf) && (!dflt)) return; /* Load module configs */ @@ -335,7 +335,7 @@ #endif case ITEM_TYPE_STRING: Efree(*(char **)ci->ptr); - if (str && *str == '\0') + if ((str) && (*str == '\0')) str = NULL; *((char **)ci->ptr) = Estrdup(str); break; @@ -451,7 +451,7 @@ unsigned int len; /* No parameters - All */ - if (!params || params[0] == '\0') + if ((!params) || (params[0] == '\0')) { ModulesConfigShow(); return; Index: E16/e/src/arrange.c =================================================================== --- E16/e/src/arrange.c (revision 51690) +++ E16/e/src/arrange.c (working copy) @@ -45,8 +45,8 @@ { int i, j; - if (current_size >= 2 && - (value <= array[0] || value >= array[current_size - 1])) + if ((current_size >= 2) && + ((value <= array[0]) || (value >= array[current_size - 1]))) return current_size; for (i = 0; i < current_size; i++) @@ -183,9 +183,9 @@ int cost, desk; int num_spaces = *ns; - if (wx < xarray[0] || (wx != xarray[0] && wx + ww > xarray[xsize - 1])) + if ((wx < xarray[0]) || ((wx != xarray[0]) && (wx + ww > xarray[xsize - 1]))) return; - if (wy < yarray[0] || (wy != yarray[0] && wy + wh > yarray[ysize - 1])) + if ((wy < yarray[0]) || ((wy != yarray[0]) && (wy + wh > yarray[ysize - 1]))) return; cost = desk = 0; @@ -384,7 +384,7 @@ spaces = NULL; alloc_spaces = 0; - if (!xarray || !yarray) + if ((!xarray) || (!yarray)) goto done; /* copy "fixed" rects into the sorted list */ @@ -409,7 +409,7 @@ ptr_s = EREALLOC(RectInfo, spaces, num_spaces); if (ptr_s) spaces = ptr_s; - if (!ptr_f || !ptr_s) + if ((!ptr_f) || (!ptr_s)) goto done; alloc_spaces = num_spaces; } @@ -433,7 +433,7 @@ if (sort == 0) break; } - if (spaces[k].q == 0 && Conf.place.center_if_desk_full) + if ((spaces[k].q == 0) && (Conf.place.center_if_desk_full)) { sorted[num_sorted].x = (tx1 + tx2 - floating[i].w) / 2; sorted[num_sorted].y = (ty1 + ty2 - floating[i].h) / 2; @@ -499,8 +499,8 @@ return; memcpy(lst, lst1, num * sizeof(EWin *)); - gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, Mode.nogroup - || Mode.move.swap, &gnum); + gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, (Mode.nogroup) + || (Mode.move.swap), &gnum); if (gwins) { for (i = 0; i < gnum; i++) @@ -518,7 +518,7 @@ ody = dy; if (dx < 0) { - if (IN_BELOW(ewin->shape_x + dx, left_bound, screen_snap_dist) + if ((IN_BELOW(ewin->shape_x + dx, left_bound, screen_snap_dist)) && (ewin->shape_x >= left_bound)) { dx = left_bound - ewin->shape_x; @@ -530,16 +530,16 @@ if (!lst[i]) continue; - if ((EoGetDesk(ewin) == EoGetDesk(lst[i]) || - EoIsSticky(lst[i])) && !(EoIsFloating(lst[i])) && - !lst[i]->state.iconified && !lst[i]->props.ignorearrange) + if (((EoGetDesk(ewin) == EoGetDesk(lst[i])) || + (EoIsSticky(lst[i]))) && (!(EoIsFloating(lst[i]))) && + (!lst[i]->state.iconified) && (!lst[i]->props.ignorearrange)) { - if (IN_BELOW + if ((IN_BELOW (ewin->shape_x + dx, EoGetX(lst[i]) + EoGetW(lst[i]) - 1, - Conf.snap.edge_snap_dist) - && SPANS_COMMON(ewin->shape_y, EoGetH(ewin), - EoGetY(lst[i]), EoGetH(lst[i])) + Conf.snap.edge_snap_dist)) + && (SPANS_COMMON(ewin->shape_y, EoGetH(ewin), + EoGetY(lst[i]), EoGetH(lst[i]))) && (ewin->shape_x >= (EoGetX(lst[i]) + EoGetW(lst[i])))) { @@ -556,8 +556,8 @@ } else if (dx > 0) { - if (IN_ABOVE - (ewin->shape_x + EoGetW(ewin) + dx, right_bound, screen_snap_dist) + if ((IN_ABOVE + (ewin->shape_x + EoGetW(ewin) + dx, right_bound, screen_snap_dist)) && ((ewin->shape_x + EoGetW(ewin)) <= right_bound)) { dx = right_bound - (ewin->shape_x + EoGetW(ewin)); @@ -569,15 +569,15 @@ if (!lst[i]) continue; - if ((EoGetDesk(ewin) == EoGetDesk(lst[i]) || - EoIsSticky(lst[i])) && !(EoIsFloating(lst[i])) && - !lst[i]->state.iconified && !lst[i]->props.ignorearrange) + if (((EoGetDesk(ewin) == EoGetDesk(lst[i])) || + (EoIsSticky(lst[i]))) && (!(EoIsFloating(lst[i]))) && + (!lst[i]->state.iconified) && (!lst[i]->props.ignorearrange)) { - if (IN_ABOVE + if ((IN_ABOVE (ewin->shape_x + EoGetW(ewin) + dx - 1, - EoGetX(lst[i]), Conf.snap.edge_snap_dist) - && SPANS_COMMON(ewin->shape_y, EoGetH(ewin), - EoGetY(lst[i]), EoGetH(lst[i])) + EoGetX(lst[i]), Conf.snap.edge_snap_dist)) + && (SPANS_COMMON(ewin->shape_y, EoGetH(ewin), + EoGetY(lst[i]), EoGetH(lst[i]))) && ((ewin->shape_x + EoGetW(ewin)) <= EoGetX(lst[i]))) { @@ -594,7 +594,7 @@ if (dy < 0) { - if (IN_BELOW(ewin->shape_y + dy, top_bound, screen_snap_dist) + if ((IN_BELOW(ewin->shape_y + dy, top_bound, screen_snap_dist)) && (ewin->shape_y >= top_bound)) { dy = top_bound - ewin->shape_y; @@ -606,16 +606,16 @@ if (!lst[i]) continue; - if ((EoGetDesk(ewin) == EoGetDesk(lst[i]) || - EoIsSticky(lst[i])) && !(EoIsFloating(lst[i])) && - !lst[i]->state.iconified && !lst[i]->props.ignorearrange) + if (((EoGetDesk(ewin) == EoGetDesk(lst[i])) || + (EoIsSticky(lst[i]))) && (!(EoIsFloating(lst[i]))) && + (!lst[i]->state.iconified) && (!lst[i]->props.ignorearrange)) { - if (IN_BELOW + if ((IN_BELOW (ewin->shape_y + dy, EoGetY(lst[i]) + EoGetH(lst[i]) - 1, - Conf.snap.edge_snap_dist) - && SPANS_COMMON(ewin->shape_x, EoGetW(ewin), - EoGetX(lst[i]), EoGetW(lst[i])) + Conf.snap.edge_snap_dist)) + && (SPANS_COMMON(ewin->shape_x, EoGetW(ewin), + EoGetX(lst[i]), EoGetW(lst[i]))) && (ewin->shape_y >= (EoGetY(lst[i]) + EoGetH(lst[i])))) { @@ -632,9 +632,9 @@ } else if (dy > 0) { - if (IN_ABOVE + if ((IN_ABOVE (ewin->shape_y + EoGetH(ewin) + dy, bottom_bound, - screen_snap_dist) + screen_snap_dist)) && ((ewin->shape_y + EoGetH(ewin)) <= bottom_bound)) { dy = bottom_bound - (ewin->shape_y + EoGetH(ewin)); @@ -646,15 +646,15 @@ if (!lst[i]) continue; - if ((EoGetDesk(ewin) == EoGetDesk(lst[i]) || - EoIsSticky(lst[i])) && !(EoIsFloating(lst[i])) && - !lst[i]->state.iconified && !lst[i]->props.ignorearrange) + if (((EoGetDesk(ewin) == EoGetDesk(lst[i])) || + (EoIsSticky(lst[i]))) && (!(EoIsFloating(lst[i]))) && + (!lst[i]->state.iconified) && (!lst[i]->props.ignorearrange)) { - if (IN_ABOVE + if ((IN_ABOVE (ewin->shape_y + EoGetH(ewin) + dy - 1, - EoGetY(lst[i]), Conf.snap.edge_snap_dist) - && SPANS_COMMON(ewin->shape_x, EoGetW(ewin), - EoGetX(lst[i]), EoGetW(lst[i])) + EoGetY(lst[i]), Conf.snap.edge_snap_dist)) + && (SPANS_COMMON(ewin->shape_x, EoGetW(ewin), + EoGetX(lst[i]), EoGetW(lst[i]))) && ((ewin->shape_y + EoGetH(ewin)) <= EoGetY(lst[i]))) { @@ -744,7 +744,7 @@ if (eo->desk != dsk) continue; - if (ew->props.ignorearrange || EoGetLayer(ew) == 0) + if ((ew->props.ignorearrange) || (EoGetLayer(ew) == 0)) continue; if (pfloating) @@ -753,8 +753,8 @@ DeskGetArea(EoGetDesk(ew), &ax, &ay); - if (!EoIsSticky(ew) && !EoIsFloating(ew) && - ew->area_x == ax && ew->area_y == ay) + if ((!EoIsSticky(ew)) && (!EoIsFloating(ew)) && + (ew->area_x == ax) && (ew->area_y == ay)) { floating = EREALLOC(RectBox, floating, nflt + 1); rb = floating + nflt++; @@ -782,7 +782,7 @@ } else if (eo->type == EOBJ_TYPE_BUTTON) { - if (!eo->sticky && eo->desk != dsk) + if ((!eo->sticky) && (eo->desk != dsk)) continue; rb->data = NULL; Index: E16/e/src/file.c =================================================================== --- E16/e/src/file.c (revision 51690) +++ E16/e/src/file.c (working copy) @@ -130,7 +130,7 @@ struct stat st; int mode; - if (!s || !*s) + if ((!s) || (!*s)) return 0; #define EFILE_ALL (EFILE_ANY | EFILE_REG | EFILE_DIR) @@ -138,9 +138,9 @@ { if (stat(s, &st) < 0) return 0; - if ((test & EFILE_REG) && !S_ISREG(st.st_mode)) + if ((test & EFILE_REG) && (!S_ISREG(st.st_mode))) return 0; - if ((test & EFILE_DIR) && !S_ISDIR(st.st_mode)) + if ((test & EFILE_DIR) && (!S_ISDIR(st.st_mode))) return 0; } Index: E16/e/src/lang.c =================================================================== --- E16/e/src/lang.c (revision 51690) +++ E16/e/src/lang.c (working copy) @@ -231,7 +231,7 @@ no = 4096; po = buf; rc = iconv(iconv_cd_str2wcs, &pi, &ni, &po, &no); - if (rc == (size_t) (-1) || no == 0) + if (rc == (size_t) (-1) || (no == 0)) return -1; wcl = (4096 - no) / sizeof(wchar_t); return wcl; @@ -392,9 +392,9 @@ enc_loc, enc_int, MB_CUR_MAX); } - if (!Estrcasecmp(enc_loc, "utf8") || !Estrcasecmp(enc_loc, "utf-8")) + if ((!Estrcasecmp(enc_loc, "utf8")) || (!Estrcasecmp(enc_loc, "utf-8"))) Mode.locale.utf8_loc = 1; - if (!Estrcasecmp(enc_int, "utf8") || !Estrcasecmp(enc_int, "utf-8")) + if ((!Estrcasecmp(enc_int, "utf8")) || (!Estrcasecmp(enc_int, "utf-8"))) Mode.locale.utf8_int = 1; #if HAVE_ICONV Index: E16/e/src/container.c =================================================================== --- E16/e/src/container.c (revision 51690) +++ E16/e/src/container.c (working copy) @@ -91,7 +91,7 @@ ecore_list_append(container_list, ct); ct->name = Estrdup(name); - ct->type = (name && !strcmp(name, "_ST_")) ? + ct->type = ((name) && (!strcmp(name, "_ST_"))) ? IB_TYPE_SYSTRAY : IB_TYPE_ICONBOX; ct->orientation = 0; ct->scrollbar_side = 1; @@ -242,7 +242,7 @@ h = ct->h; ContainerLayout(ct, px, py, pw, ph); - if (*pw != w || *ph != h) + if ((*pw != w) || (*ph != h)) ct->do_update = 1; } @@ -251,7 +251,7 @@ { Container *ct = (Container *) ewin->data; - if (!resize && !ct->do_update && !TransparencyUpdateNeeded()) + if ((!resize) && (!ct->do_update) && (!TransparencyUpdateNeeded())) return; ct->w = ewin->client.w; @@ -368,8 +368,8 @@ { cto = &ct->objs[i]; - if (px >= cto->xo - 1 && py >= cto->yo - 1 && - px < cto->xo + cto->wo + 1 && py < cto->yo + cto->ho + 1) + if ((px >= cto->xo - 1) && (py >= cto->yo - 1) && + (px < cto->xo + cto->wo + 1) && (py < cto->yo + cto->ho + 1)) return cto->obj; } @@ -389,7 +389,7 @@ else ct->ic_box = ImageclassFind("ICONBOX_HORIZONTAL", 0); - if (ct->draw_icon_base && !ct->im_item_base) + if ((ct->draw_icon_base) && (!ct->im_item_base)) { ct->ic_item_base = ImageclassFind("DEFAULT_ICON_BUTTON", 0); if (ct->ic_item_base) @@ -438,9 +438,9 @@ ct->ops->ObjSizeCalc(ct, cto); /* Outer size */ - if (ct->draw_icon_base && ct->im_item_base) + if ((ct->draw_icon_base) && (ct->im_item_base)) { - if (cto->wi > 0 && cto->hi > 0) + if ((cto->wi > 0) && (cto->hi > 0)) { cto->wo = ct->iconsize + padl + padr; cto->ho = ct->iconsize + padt + padb; @@ -452,7 +452,7 @@ } else { - if (cto->wi > 0 && cto->hi > 0) + if ((cto->wi > 0) && (cto->hi > 0)) { if (ct->orientation) { @@ -1078,7 +1078,7 @@ EMoveResizeWindow(ct->icon_win, ib_x0, ib_y0, ib_w0, ib_h0); - if (ib_ic_cover && !ct->cover_hide) + if ((ib_ic_cover) && (!ct->cover_hide)) { EMoveResizeWindow(ct->cover_win, ib_xlt, ib_ylt, ib_ww, ib_hh); EMapWindow(ct->cover_win); @@ -1091,12 +1091,12 @@ EUnmapWindow(ct->cover_win); } - if (ct->nobg && ct->num_objs == 0) + if ((ct->nobg) && (ct->num_objs == 0)) { im = NULL; } - else if (ct->ic_box && - (!ct->nobg || (ct->type == IB_TYPE_SYSTRAY && !ct->draw_icon_base))) + else if ((ct->ic_box) && + ((!ct->nobg) || ((ct->type == IB_TYPE_SYSTRAY) && (!ct->draw_icon_base)))) { /* Start out with iconbox image class image */ im = ImageclassGetImageBlended(ct->ic_box, ct->icon_win, ib_w0, ib_h0, @@ -1116,7 +1116,7 @@ cto = &ct->objs[i]; - if (ct->draw_icon_base && ct->im_item_base) + if ((ct->draw_icon_base) && (ct->im_item_base)) { EImageGetSize(ct->im_item_base, &ww, &hh); EImageBlend(im, ct->im_item_base, EIMAGE_BLEND | EIMAGE_ANTI_ALIAS, @@ -1132,7 +1132,7 @@ EImageApplyToWin(im, ct->icon_win, EIMAGE_HIGH_MASK_THR, 0, 0); EImageFree(im); - if (ct->type == IB_TYPE_SYSTRAY && ct->nobg && !ct->draw_icon_base) + if ((ct->type == IB_TYPE_SYSTRAY) && (ct->nobg) && (!ct->draw_icon_base)) EShapePropagate(ct->icon_win); } else @@ -1917,7 +1917,7 @@ { Container *ct; - if (!params || !params[0]) + if ((!params) || (!params[0])) params = "DEFAULT"; ct = ContainerFind(params); @@ -1967,7 +1967,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { /* List iconboxes */ } Index: E16/e/src/sound_esd.c =================================================================== --- E16/e/src/sound_esd.c (revision 51690) +++ E16/e/src/sound_esd.c (working copy) @@ -98,7 +98,7 @@ if (!s) return; - if (s->id && sound_fd >= 0) + if ((s->id) && (sound_fd >= 0)) { /* Why the hell is this symbol not in esd? */ /* it's in esd.h - evil evil evil */ @@ -112,7 +112,7 @@ static void _sound_esd_Play(Sample * s) { - if (sound_fd < 0 || !s) + if ((sound_fd < 0) || (!s)) return; if (s->id > 0) Index: E16/e/src/menus.c =================================================================== --- E16/e/src/menus.c (revision 51690) +++ E16/e/src/menus.c (working copy) @@ -159,7 +159,7 @@ { EWin *ewin; - if (!m || !m->shown) + if ((!m) || (!m->shown)) return; if (m->sel_item) @@ -224,13 +224,13 @@ if (!m) return; - if (Mode.mode != MODE_NONE && !m->redraw) + if ((Mode.mode != MODE_NONE) && (!m->redraw)) return; if (TransparencyUpdateNeeded()) m->redraw = 1; - if ((!m->style->use_item_bg && m->pmm.pmap == 0) || m->redraw) + if (((!m->style->use_item_bg) && (m->pmm.pmap == 0)) || (m->redraw)) { MenuRedraw(m); EwinUpdateShapeInfo(ewin); @@ -263,7 +263,7 @@ int MenuLoad(Menu * m) { - if (!m || !m->loader) + if ((!m) || (!m->loader)) return 0; return m->loader(m); @@ -280,13 +280,13 @@ if (m->shown) return; - if (MenuLoad(m) || m->redraw) + if ((MenuLoad(m)) || (m->redraw)) MenuRealize(m); if (m->num <= 0) return; - if (!m->win || !m->items[0]->win) + if ((!m->win) || (!m->items[0]->win)) MenuRealize(m); if (!m->style) @@ -542,7 +542,7 @@ { if (m->style) m->style->ref_count--; - if (!ms && m->parent) + if ((!ms) && (m->parent)) ms = m->parent->style; if (!ms) ms = MenuStyleFind("DEFAULT"); @@ -626,7 +626,7 @@ Efree(mi->params); for (j = 0; j < 3; j++) FreePmapMask(&(mi->pmm[j])); - if (!destroying && mi->win) + if ((!destroying) && (mi->win)) EDestroyWindow(mi->win); ImageclassFree(mi->icon_iclass); Efree(mi); @@ -757,7 +757,7 @@ m->items[i]->text_w = w; m->items[i]->text_h = h; } - if (m->items[i]->icon_iclass && Conf.menus.show_icons) + if ((m->items[i]->icon_iclass) && (Conf.menus.show_icons)) { im = ImageclassGetImage(m->items[i]->icon_iclass, 0, 0, 0); if (im) @@ -767,7 +767,7 @@ w = h = m->icon_size; else if (m->icon_size == 0) w = h = Conf.menus.icon_size; - if (w <= 0 || h <= 0) + if ((w <= 0) || (h <= 0)) EImageGetSize(im, &w, &h); m->items[i]->icon_w = w; m->items[i]->icon_h = h; @@ -829,7 +829,7 @@ mmh = 0; nmaxy = 3 * WinGetH(VROOT) / (4 * maxh + 1); - if (m->style->maxy && nmaxy > m->style->maxy) + if ((m->style->maxy) && (nmaxy > m->style->maxy)) nmaxy = m->style->maxy; r = 0; @@ -837,7 +837,7 @@ y = 0; for (i = 0; i < m->num; i++) { - if (r == 0 && (m->style->bg_iclass) && (!m->style->use_item_bg)) + if ((r == 0) && (m->style->bg_iclass) && (!m->style->use_item_bg)) { x += pad->left; y += pad->top; @@ -865,7 +865,7 @@ ((maxx2 - m->items[i]->icon_w) / 2), ((maxh - m->items[i]->icon_h) / 2)); } - if (m->items[i]->icon_iclass && Conf.menus.show_icons) + if ((m->items[i]->icon_iclass) && (Conf.menus.show_icons)) { ImageclassApply(m->items[i]->icon_iclass, m->items[i]->icon_win, 0, 0, STATE_NORMAL, ST_MENU_ITEM); @@ -1096,8 +1096,8 @@ { const Menu *m = (const Menu *)data; - if ((m->name && !strcmp((const char *)match, m->name)) || - (m->alias && !strcmp((const char *)match, m->alias))) + if (((m->name) && (!strcmp((const char *)match, m->name))) || + ((m->alias) && (!strcmp((const char *)match, m->alias)))) return 0; return 1; @@ -1179,7 +1179,7 @@ TIMER_DEL(menu_timer_submenu); m = Mode_menus.first; - if (m && m->transient) + if ((m) && (m->transient)) MenuDestroy(m); else MenuHide(m); @@ -1287,10 +1287,10 @@ if (!mi) goto check_next; m = mi->child; - if (!m || m->num <= 0) + if ((!m) || (m->num <= 0)) break; ewin = m->ewin; - if (!ewin || !EwinIsMapped(ewin)) + if ((!ewin) || (!EwinIsMapped(ewin))) break; mi = MenuFindItemByChild(m, m->child); goto check_activate; @@ -1541,7 +1541,7 @@ static void MenuSelectItem(Menu * m, MenuItem * mi, int focus) { - if (mi && focus) + if ((mi) && (focus)) { if (Mode_menus.active != m) { @@ -1604,14 +1604,14 @@ if (EoGetY(ewin) + ydist < sy) ydist = sy - EoGetY(ewin); - if (xdist == 0 && ydist == 0) + if ((xdist == 0) && (ydist == 0)) return; i = 0; for (m = Mode_menus.first; m; m = m->child) { etmp = m->ewin; - if (!etmp || etmp == ewin2) + if ((!etmp) || (etmp == ewin2)) break; menus[i] = etmp; fx[i] = EoGetX(etmp); @@ -1643,14 +1643,14 @@ int bl2, br2, bt2, bb2; data = (struct _mdata *)dat; - if (!data || !data->m) + if ((!data) || (!data->m)) goto done; m = data->m; if (!ecore_list_goto(menu_list, m)) goto done; ewin = m->ewin; - if (!ewin || !EwinFindByPtr(ewin)) + if ((!ewin) || (!EwinFindByPtr(ewin))) goto done; if (!EoIsShown(ewin)) goto done; @@ -1671,12 +1671,12 @@ mi->child->parent = m; MenuShow(mi->child, 1); ewin2 = mi->child->ewin; - if (!ewin2 || !EwinFindByPtr(ewin2)) + if ((!ewin2) || (!EwinFindByPtr(ewin2))) goto done; EGetGeometry(mi->win, NULL, &mx, &my, &mw, NULL, NULL, NULL); my2 = 0; - if (mi->child->num > 0 && mi->child->items[0]) + if ((mi->child->num > 0) && (mi->child->items[0])) EGetGeometry(mi->child->items[0]->win, NULL, NULL, &my2, NULL, NULL, NULL, NULL); @@ -1724,12 +1724,12 @@ if (mi == mi_prev) return; - if (mi && !mi->child && mi_prev && !mi_prev->child) + if ((mi) && (!mi->child) && (mi_prev) && (!mi_prev->child)) return; TIMER_DEL(menu_timer_submenu); - if ((mi && mi->child && !mi->child->shown) || (mi && mi->child != m->child)) + if (((mi) && (mi->child) && (!mi->child->shown)) || ((mi) && (mi->child != m->child))) { mdata.m = m; mdata.mi = mi; @@ -1947,7 +1947,7 @@ else MenuSetName(m, s2); params = _MenuCheckAlias(s2); - if (m && params) + if ((m) && (params)) MenuSetAlias(m, params); continue; @@ -1956,7 +1956,7 @@ if (strcmp("NULL", s2)) ic = ImageclassFind(s2, 0); _EFREE(txt); - if (p3 && *p3) + if ((p3) && (*p3)) txt = Estrdup(p3); continue; } @@ -2030,8 +2030,8 @@ ts = time(0); ECORE_LIST_FOR_EACH(menu_list, m) { - if (m->shown || !m->filled || - ts - m->last_access < MENU_UNLOAD_CHECK_INTERVAL) + if ((m->shown) || (!m->filled) || + (ts - m->last_access < MENU_UNLOAD_CHECK_INTERVAL)) continue; if (!m->loader) @@ -2191,7 +2191,7 @@ p += len; } - if (!p || cmd[0] == '?') + if ((!p) || (cmd[0] == '?')) { IpcPrintf("Menus - active=%d\n", MenusActive()); } @@ -2211,7 +2211,7 @@ { if (*p == '\0') p = NULL; - if (p && !strcmp(prm, "named")) + if ((p) && (!strcmp(prm, "named"))) { Esnprintf(prm, sizeof(prm), "%s", p); p = NULL; Index: E16/e/src/e16-ecore_hints.c =================================================================== --- E16/e/src/e16-ecore_hints.c (revision 51690) +++ E16/e/src/e16-ecore_hints.c (working copy) @@ -150,11 +150,11 @@ &bytes_after, &prop_ret) != Success) return -1; - if (type_ret != type || format_ret != 32) + if ((type_ret != type) || (format_ret != 32)) { num = -1; } - else if (num_ret == 0 || !prop_ret) + else if ((num_ret == 0) || (!prop_ret)) { num = 0; } @@ -274,7 +274,7 @@ if (!pstr) goto done; for (i = 0; i < items; i++) - pstr[i] = (list[i] && (*list[i] || i < items - 1)) ? + pstr[i] = ((list[i]) && ((*list[i]) || (i < items - 1))) ? strdup(list[i]) : NULL; } if (list) @@ -373,7 +373,7 @@ XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False, ECORE_X_ATOM_UTF8_STRING, &type_ret, &format_ret, &num_ret, &bytes_after, &prop_ret); - if (prop_ret && num_ret > 0 && format_ret == 8) + if ((prop_ret) && (num_ret > 0) && (format_ret == 8)) { str = (char *)malloc(num_ret + 1); if (str) @@ -706,9 +706,9 @@ xch.res_class = NULL; if (XGetClassHint(_ecore_x_disp, win, &xch)) { - if (name && xch.res_name) + if ((name) && (xch.res_name)) *name = strdup(xch.res_name); - if (clss && xch.res_class) + if ((clss) && (xch.res_class)) *clss = strdup(xch.res_class); XFree(xch.res_name); XFree(xch.res_class); Index: E16/e/dox/format.c =================================================================== --- E16/e/dox/format.c (revision 51690) +++ E16/e/dox/format.c (working copy) @@ -746,7 +746,7 @@ wc++; eot++; strcpy(ss, s); - if ((eot != 1) && spaceflag) + if ((eot != 1) && (spaceflag)) strcat(s, " "); linkwc = -1; @@ -761,7 +761,7 @@ if (islink == 1) { - if (eol || ((wd[0] != '_') && spaceflag)) /* if NO link tag, ... */ + if ((eol) || ((wd[0] != '_') && (spaceflag))) /* if NO link tag, ... */ { link_txt[0] = '\0'; link_link[0] = '\0'; @@ -790,7 +790,7 @@ } k = strlen(link_txt); - for (; wd[j] != '(' && wd[j] != '\0'; j++, k++) + for (; (wd[j] != '(') && (wd[j] != '\0'); j++, k++) { if (wd[j] == '_') link_txt[k] = ' '; @@ -812,7 +812,7 @@ k = strlen(link_link) - 1; if (k <= 0) continue; - for (j = k; j > 0 && link_link[j] != ')'; j--) + for (j = k; (j > 0) && (link_link[j] != ')'); j--) ; link_link[j] = '\0'; strcpy(wd, link_txt); @@ -898,7 +898,7 @@ wastext = 1; TextDraw(&ts, win, txt_disp, x + off, y, xspace, 99999, 17, justification); - if (islink > 1 && linkwc > wc) + if ((islink > 1) && (linkwc > wc)) { islink = 0; link_link[0] = '\0'; Index: E16/e/dox/dox.c =================================================================== --- E16/e/dox/dox.c (revision 51690) +++ E16/e/dox/dox.c (working copy) @@ -355,7 +355,7 @@ wx = (VRoot.w - w) / 2; wy = (VRoot.h - (h + t)) / 2; #ifdef USE_XINERAMA - if (VRoot.win == DefaultRootWindow(disp) && XineramaIsActive(disp)) + if ((VRoot.win == DefaultRootWindow(disp)) && (XineramaIsActive(disp))) { Window rt, ch; int d; @@ -370,10 +370,10 @@ screens = XineramaQueryScreens(disp, &num); for (i = 0; i < num; i++) { - if (pointer_x >= screens[i].x_org && - pointer_x <= (screens[i].width + screens[i].x_org) && - pointer_y >= screens[i].y_org && - pointer_y <= (screens[i].height + screens[i].y_org)) + if ((pointer_x >= screens[i].x_org) && + (pointer_x <= (screens[i].width + screens[i].x_org)) && + (pointer_y >= screens[i].y_org) && + (pointer_y <= (screens[i].height + screens[i].y_org))) { wx = ((screens[i].width - w) / 2) + screens[i].x_org; wy = ((screens[i].height - (h + t)) / 2) + screens[i].y_org; @@ -695,8 +695,8 @@ break; case ClientMessage: - if (ev.xclient.message_type == ATOM_WM_PROTOCOLS && - (Atom) ev.xclient.data.l[0] == ATOM_WM_DELETE_WINDOW) + if ((ev.xclient.message_type == ATOM_WM_PROTOCOLS) && + ((Atom) ev.xclient.data.l[0] == ATOM_WM_DELETE_WINDOW)) goto done; break; Index: E16/e/lib/e16_trip.c =================================================================== --- E16/e/lib/e16_trip.c (revision 51690) +++ E16/e/lib/e16_trip.c (working copy) @@ -86,7 +86,7 @@ if (p) *p = '\0'; } - if (!name || *name == '\0') + if ((!name) || (*name == '\0')) name = (char *)"?"; l += snprintf(s + l, sizeof(s) - l, name); #else Index: E16/e16menuedit/src/icon_chooser.c =================================================================== --- E16/e16menuedit/src/icon_chooser.c (revision 51690) +++ E16/e16menuedit/src/icon_chooser.c (working copy) @@ -131,8 +131,8 @@ model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview_menu)); select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview_menu)); - if (gtk_tree_selection_get_selected (select, &model, &iter) - && filename) + if ((gtk_tree_selection_get_selected (select, &model, &iter)) + && (filename)) { const gchar *entry_select; gint width, height; Index: E16/e16menuedit/src/e16menu.c =================================================================== --- E16/e16menuedit/src/e16menu.c (revision 51690) +++ E16/e16menuedit/src/e16menu.c (working copy) @@ -88,7 +88,7 @@ while (fgets (s, 4096, menufile)) { s[strlen (s) - 1] = 0; - if ((s[0] && s[0] != '#')) + if (((s[0]) && (s[0] != '#'))) { if (first) { @@ -173,7 +173,7 @@ while (fgets (s, 4096, menufile)) { s[strlen (s) - 1] = 0; - if ((s[0] && s[0] != '#')) + if (((s[0]) && (s[0] != '#'))) { if (first) first = 0; Index: E16/e16menuedit/src/regex_func.c =================================================================== --- E16/e16menuedit/src/regex_func.c (revision 51690) +++ E16/e16menuedit/src/regex_func.c (working copy) @@ -119,7 +119,7 @@ for (i = 0; i < maxsub ; i++) { - if (submatch[i].rm_so == submatch[i].rm_eo && submatch[i].rm_eo == -1) + if ((submatch[i].rm_so == submatch[i].rm_eo) && (submatch[i].rm_eo == -1)) { break; } Index: E16/e16keyedit/viewer.c =================================================================== --- E16/e16keyedit/viewer.c (revision 51690) +++ E16/e16keyedit/viewer.c (working copy) @@ -408,7 +408,7 @@ gtk_entry_set_text(GTK_ENTRY(act_params), paramsused); i = match_action_by_selection(actperform); - if (i < 0 || actions[i].param_tpe == 0) + if ((i < 0) || (actions[i].param_tpe == 0)) { gtk_entry_set_editable(GTK_ENTRY(act_params), FALSE); gtk_widget_set_sensitive(act_params, FALSE); @@ -884,7 +884,7 @@ goto do_check; s = msg; - while (*s && *s != '.') + while ((*s) && (*s != '.')) s++; s--; sscanf(s, "%d.%d.%d", &major, &minor, µ); @@ -933,10 +933,10 @@ break; while (isspace(*s)) s++; - if (*s == '\0' || *s == '#') + if ((*s == '\0') || (*s == '#')) continue; n = strlen(s); - while (n > 0 && (s[n - 1] == '\n' || s[n - 1] == '\r')) + while ((n > 0) && ((s[n - 1] == '\n') || (s[n - 1] == '\r'))) n--; if (n <= 0) continue; Index: E16/e16keyedit/menus.c =================================================================== --- E16/e16keyedit/menus.c (revision 51690) +++ E16/e16keyedit/menus.c (working copy) @@ -50,7 +50,7 @@ { GtkWidget *menuitem; - if (szName && strlen(szName)) + if ((szName) && (strlen(szName))) { menuitem = gtk_menu_item_new_with_label(szName); if (func) @@ -65,14 +65,14 @@ gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - if (szAccel && szAccel[0] == '^') + if ((szAccel) && (szAccel[0] == '^')) { gtk_widget_add_accelerator(menuitem, "activate", accel_group, szAccel[1], GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); } - if (szTip && strlen(szTip)) + if ((szTip) && (strlen(szTip))) { gtk_tooltips_set_tip(tooltips, menuitem, szTip, NULL); } Index: E16/epplets/api/snprintf.c =================================================================== --- E16/epplets/api/snprintf.c (revision 51690) +++ E16/epplets/api/snprintf.c (working copy) @@ -159,7 +159,7 @@ goto nextch; case '0': /* set zero padding if len not set */ - if (len == 0 && set_precision == 0) + if ((len == 0) && (set_precision == 0)) zpad = '0'; case '1': case '2': @@ -309,7 +309,7 @@ /* cheap strlen so you do not have library call */ for (strlen = 0; (c = value[strlen]); ++strlen) { - if (visible_control && iscntrl(c) && !isspace(c)) + if ((visible_control) && (iscntrl(c)) && (!isspace(c))) { ++strlen; } @@ -328,7 +328,7 @@ /* output characters */ for (i = 0; (c = value[i]); ++i) { - if (visible_control && iscntrl(c) && !isspace(c)) + if ((visible_control) && (iscntrl(c)) && (!isspace(c))) { dopr_outch('^'); c = ('@' | (c & 0x1F)); @@ -386,7 +386,7 @@ padlen = -padlen; /* DEBUGP(( "str '%s', place %d, sign %c, padlen %d\n", * convert,place,signvalue,padlen)); */ - if (zpad && padlen > 0) + if ((zpad) && (padlen > 0)) { if (signvalue) { @@ -464,7 +464,7 @@ static void dopr_outch(int c) { - if (!end || output < end) + if ((!end) || (output < end)) { *output++ = c; } Index: E16/epplets/api/epplet.c =================================================================== --- E16/epplets/api/epplet.c (revision 51690) +++ E16/epplets/api/epplet.c (working copy) @@ -591,7 +591,7 @@ /* Check if the epplet imageclasses are there. */ ECommsSend("imageclass EPPLET_BUTTON query"); msg = ECommsWaitForMessage(); - if (!msg || strstr(msg, "not")) + if ((!msg) || (strstr(msg, "not"))) { Epplet_dialog_ok ("Epplet Error: Your theme does not contain the imageclasses needed to run epplets."); @@ -695,7 +695,7 @@ /* Check if the epplet imageclasses are there. */ ECommsSend("imageclass EPPLET_BUTTON query"); msg = ECommsWaitForMessage(); - if (!msg || strstr(msg, "not")) + if ((!msg) || (strstr(msg, "not"))) { Epplet_dialog_ok ("Epplet Error: Your theme does not contain the imageclasses needed to run epplets."); @@ -820,7 +820,7 @@ int i, num; Epplet_gadget *lst, g; - if (!gads || gad_num <= 0) + if ((!gads) || (gad_num <= 0)) return; /* Create work copy of gadget list @@ -1325,8 +1325,8 @@ { char *msg; - if (ev->xclient.format == 32 - && ev->xclient.data.l[0] == (signed)wmDeleteWindow) + if ((ev->xclient.format == 32) + && (ev->xclient.data.l[0] == (signed)wmDeleteWindow)) Epplet_handle_delete_event(ev->xclient.window); else { @@ -1360,8 +1360,8 @@ (*keypress_func) (keypress_data, ev->xkey.window, key); else { - if (last_gadget && - ((GadGeneral *) last_gadget)->type == E_TEXTBOX) + if ((last_gadget) && + (((GadGeneral *) last_gadget)->type == E_TEXTBOX)) { Epplet_textbox_handle_keyevent(ev, last_gadget); Epplet_draw_textbox(last_gadget); @@ -1590,7 +1590,7 @@ et = q_first; q_first = q_first->next; (*(et->func)) (et->data); - if (et && et->name) + if ((et) && (et->name)) free(et->name); if (et) free(et); @@ -1858,7 +1858,7 @@ XEvent ev; Atom a = 0; - if (!s || !dd) + if ((!s) || (!dd)) return; len = strlen(s); if (!a) @@ -2208,7 +2208,7 @@ char *s, *line_break; GADGET_CONFIRM_TYPE(eg, E_TEXTBOX); - if (!new_contents || ((len = strlen(new_contents)) == 0)) + if ((!new_contents) || ((len = strlen(new_contents)) == 0)) return; g = (GadTextBox *) eg; @@ -2274,7 +2274,7 @@ char *s; GADGET_CONFIRM_TYPE(eg, E_TEXTBOX); - if (!new_contents || ((len = strlen(new_contents)) == 0)) + if ((!new_contents) || ((len = strlen(new_contents)) == 0)) { Epplet_reset_textbox(eg); return; @@ -2508,7 +2508,7 @@ len = XLookupString(&ev->xkey, (char *)kbuf, sizeof(kbuf), &keysym, NULL); /* Convert unmapped Latin2-4 keysyms into Latin1 characters */ - if (!len && (keysym >= 0x0100) && (keysym < 0x0400)) + if ((!len) && (keysym >= 0x0100) && (keysym < 0x0400)) { len = 1; kbuf[0] = (keysym & 0xff); @@ -2524,7 +2524,7 @@ { --g->cursor_pos; - if (g->contents && *(g->contents) && (g->x_offset < 0)) + if ((g->contents) && (*(g->contents)) && (g->x_offset < 0)) { if (g->contents[strlen(g->contents) - 1] == ' ') char_width = Epplet_textbox_spacesize(g); @@ -2550,7 +2550,7 @@ { char s[2]; - if (g->contents && (g->cursor_pos < strlen(g->contents))) + if ((g->contents) && (g->cursor_pos < strlen(g->contents))) ++g->cursor_pos; Epplet_textbox_textsize(g, &text_width, &h, g->contents); @@ -2574,7 +2574,7 @@ } case XK_Delete: { - if (g->contents && *(g->contents) + if ((g->contents) && (*(g->contents)) && (g->cursor_pos < strlen(g->contents))) { int contents_len; @@ -2602,7 +2602,7 @@ { int w, h; - if (g->contents && (g->cursor_pos != strlen(g->contents))) + if ((g->contents) && (g->cursor_pos != strlen(g->contents))) { g->cursor_pos = strlen(g->contents); @@ -2619,18 +2619,18 @@ break; } - if (len <= 0 || len > (int)sizeof(kbuf)) + if ((len <= 0) || (len > (int)sizeof(kbuf))) return; kbuf[len] = 0; - if (*kbuf == '\r' || *kbuf == '\n') + if ((*kbuf == '\r') || (*kbuf == '\n')) { if (g->func) (*(g->func)) (g->data); } else if (*kbuf == '\b') { - if (g->contents && *(g->contents) && (g->cursor_pos > 0)) + if ((g->contents) && (*(g->contents)) && (g->cursor_pos > 0)) { char *s; @@ -2680,7 +2680,7 @@ if (*kbuf == ' ') char_width = Epplet_textbox_spacesize(g); - if ((*kbuf == '\b') && g->contents && *(g->contents)) + if ((*kbuf == '\b') && (g->contents) && (*(g->contents))) { if (g->x_offset < 0) { @@ -3436,7 +3436,7 @@ if ((g->pw > 0) && (g->ph > 0)) XCopyArea(disp, g->general.parent->bg_bg, g->general.parent->bg_pmap, gc, g->x, g->y, g->pw, g->ph, g->x, g->y); - if (g->image && !un_only) + if ((g->image) && (!un_only)) { im = imlib_load_image(g->image); if (im) @@ -4026,7 +4026,7 @@ gg = (GadGeneral *) gadget; if (g->label) { - if (label && !strcmp(g->label, label)) + if ((label) && (!strcmp(g->label, label))) return; /* The labels are identical, so no sense in redrawing */ else free(g->label); /* The labels are different. Proceed. */ @@ -4087,7 +4087,7 @@ gg = (GadGeneral *) gadget; if (g->label) { - if (label && !strcmp(g->label, label)) + if ((label) && (!strcmp(g->label, label))) return; /* The labels are identical, so no sense in redrawing */ else free(g->label); /* The labels are different. Proceed. */ @@ -4110,7 +4110,7 @@ Epplet_draw_label(gadget, 1); if (g->label) { - if (label && !strcmp(g->label, label)) + if ((label) && (!strcmp(g->label, label))) return; /* The labels are identical, so no sense in redrawing */ else free(g->label); /* The labels are different. Proceed. */ @@ -5222,7 +5222,7 @@ { GadGeneral *gg = (GadGeneral *) g; - if (gg->visible || force) + if ((gg->visible) || (force)) { switch (gg->type) { @@ -5616,7 +5616,7 @@ for (;;) { err = fcntl(fd, F_SETLK, &fl); - if (err == 0 || errno != EINTR) + if ((err == 0) || (errno != EINTR)) break; } if (err == 0) @@ -5625,7 +5625,7 @@ locked = 1; break; } - if (errno == EACCES || errno == EAGAIN) + if ((errno == EACCES) || (errno == EAGAIN)) { /* Locking failed due to held lock */ continue; @@ -5746,7 +5746,7 @@ { s2[0] = s3[0] = '\0'; sscanf(s, "%s %[^\n]\n", s2, s3); - if (!(*s2) || (!*s3) || (*s2 == '\n') || (*s2 == '#')) + if ((!(*s2)) || (!*s3) || (*s2 == '\n') || (*s2 == '#')) { continue; } @@ -5779,7 +5779,7 @@ FILE *f; int i; - if (!(config_dict) || (config_dict->num_entries <= 0)) + if ((!(config_dict)) || (config_dict->num_entries <= 0)) return; if (!(f = fopen(epplet_cfg_file, "w"))) @@ -5796,7 +5796,7 @@ epplet_name); for (i = 0; i < config_dict->num_entries; i++) { - if (config_dict->entries[i].key && *(config_dict->entries[i].value)) + if ((config_dict->entries[i].key) && (*(config_dict->entries[i].value))) { fprintf(f, "%s %s\n", config_dict->entries[i].key, config_dict->entries[i].value); @@ -5858,7 +5858,7 @@ for (i = 0; i < config_dict->num_entries; i++) { ci = &(config_dict->entries[i]); - if ((ci->key) && !strcmp(key, ci->key)) + if ((ci->key) && (!strcmp(key, ci->key))) /* we've found the key */ return (ci->value); } @@ -5876,7 +5876,7 @@ for (i = 0; i < config_dict->num_entries; i++) { ci = &(config_dict->entries[i]); - if ((ci->key) && !strcmp(key, ci->key)) + if ((ci->key) && (!strcmp(key, ci->key))) /* we've found the key */ return (ci->value); } @@ -5895,7 +5895,7 @@ for (i = 0; i < config_dict->num_entries; i++) { ci = &(config_dict->entries[i]); - if ((ci->key) && !strcmp(key, ci->key)) + if ((ci->key) && (!strcmp(key, ci->key))) /* we've found the key */ { if (ci->value != value) Index: E16/epplets/epplets/E-Magic.c =================================================================== --- E16/epplets/epplets/E-Magic.c (revision 51690) +++ E16/epplets/epplets/E-Magic.c (working copy) @@ -158,7 +158,7 @@ char *s; s = Epplet_textbox_contents(cfg_tb_image); - if (*s && strcmp(s, image)) + if ((*s) && (strcmp(s, image))) { Epplet_modify_config("image", s); image = Epplet_query_config("image"); @@ -166,7 +166,7 @@ } s = Epplet_textbox_contents(cfg_tb_ans_file); - if (*s && strcmp(s, ans_file) && parse_answers(s)) + if ((*s) && (strcmp(s, ans_file)) && (parse_answers(s))) { Epplet_modify_config("answers", s); ans_file = Epplet_query_config("answers"); @@ -259,8 +259,8 @@ { register char *front, *back; - for (front = s; *front && isspace(*front); front++); - for (back = s + strlen(s) - 1; *back && isspace(*back) && back > front; + for (front = s; (*front) && (isspace(*front)); front++); + for (back = s + strlen(s) - 1; (*back) && (isspace(*back)) && (back > front); back--); *(++back) = 0; @@ -340,7 +340,7 @@ Esnprintf(ss, sizeof(ss), "%s/answers.txt", Epplet_data_dir()); ans_file = Epplet_query_config_def("answers", ss); - if (!parse_answers(ans_file) && !parse_answers(ans_file = ss)) + if ((!parse_answers(ans_file)) && (!parse_answers(ans_file = ss))) { /* Couldn't find the answers. Exit. */ Esnprintf(buff, sizeof(buff), Index: E16/epplets/epplets/E-Toolbox.c =================================================================== --- E16/epplets/epplets/E-Toolbox.c (revision 51690) +++ E16/epplets/epplets/E-Toolbox.c (working copy) @@ -189,7 +189,7 @@ { free(buttons[n].image); } - if (buttons[n].gad && buttons[n].popup == -1) + if ((buttons[n].gad) && (buttons[n].popup == -1)) { Epplet_gadget_destroy(buttons[n].gad); } @@ -211,7 +211,7 @@ { Epplet_window_hide(main_win); Epplet_window_show(shade_win); - if (sw_x == (unsigned short)-1 && sw_y == (unsigned short)-1) + if ((sw_x == (unsigned short)-1) && (sw_y == (unsigned short)-1)) { get_xy(main_win, &sw_x, &sw_y); sw_x += (16 * (w - 1)); @@ -323,7 +323,7 @@ } button_cnt = j; - if (new_w != w || new_h != h) + if ((new_w != w) || (new_h != h)) { resize(new_w, new_h, !ok); } @@ -574,7 +574,7 @@ { new_h = atoi(tmp); } - if (new_w != w || new_h != h) + if ((new_w != w) || (new_h != h)) { resize(new_w, new_h, 0); } @@ -691,7 +691,7 @@ { toolbutton_t *b = data; - if (b && b->prog) + if ((b) && (b->prog)) { if (*(b->prog) == '<') { Index: E16/epplets/epplets/E-Time.c =================================================================== --- E16/epplets/epplets/E-Time.c (revision 51690) +++ E16/epplets/epplets/E-Time.c (working copy) @@ -65,7 +65,7 @@ struct tm *tim2; time_t t2; - if (timezone_str && *timezone_str) + if ((timezone_str) && (*timezone_str)) { Esnprintf(tm, sizeof(tm), "TZ=%s", timezone_str); putenv(tm); Index: E16/epplets/epplets/E-Exec.c =================================================================== --- E16/epplets/epplets/E-Exec.c (revision 51690) +++ E16/epplets/epplets/E-Exec.c (working copy) @@ -48,7 +48,7 @@ if (!Epplet_popup_entry_get_data(history_popup, 0)) Epplet_remove_popup_entry(history_popup, 0); - if (command && strlen(command)) + if ((command) && (strlen(command))) { command_exists = FALSE; for (i = 0; i < num_commands; i++) Index: E16/epplets/epplets/E-Pinger.c =================================================================== --- E16/epplets/epplets/E-Pinger.c (revision 51690) +++ E16/epplets/epplets/E-Pinger.c (working copy) @@ -80,7 +80,7 @@ now = time(NULL); - if (pinger_when == 0 || pinger_when <= now) + if ((pinger_when == 0) || (pinger_when <= now)) { pinger_when = now + pinger_pause; bg_system(cmd); @@ -123,7 +123,7 @@ /* Set reaper so we don't get zombies */ signal(SIGCHLD, (void (*)(int))pinger_reaper); - if (!command || *command == '\0') + if ((!command) || (*command == '\0')) { return 1; } @@ -294,7 +294,7 @@ { char *c_p, *last_p; - if (!new_host || *new_host == '\0') + if ((!new_host) || (*new_host == '\0')) { return (0); } @@ -307,7 +307,7 @@ for (last_p = new_host + strlen(new_host), c_p = new_host; c_p < last_p; c_p++) { - if (!(isalnum(*c_p) || *c_p == '.' || *c_p == '-')) + if (!((isalnum(*c_p)) || (*c_p == '.') || (*c_p == '-'))) { return (-1); } @@ -332,7 +332,7 @@ char *c_p; char *last_p; - if (!new_pause || *new_pause == '\0') + if ((!new_pause) || (*new_pause == '\0')) { return (0); } Index: E16/epplets/epplets/E-UrlWatch.c =================================================================== --- E16/epplets/epplets/E-UrlWatch.c (revision 51690) +++ E16/epplets/epplets/E-UrlWatch.c (working copy) @@ -405,7 +405,7 @@ } else { - while (!feof(fp) && j < position) + while ((!feof(fp)) && (j < position)) { j++; fgets(buf, sizeof(buf), fp); @@ -431,7 +431,7 @@ return; /* Perform new url command (eg play a sound) */ - if (opt.do_new_url_command && opt.new_url_command) + if ((opt.do_new_url_command) && (opt.new_url_command)) system(opt.new_url_command); if (opt.always_show_file_urls) @@ -525,7 +525,7 @@ *p = '\0'; /* If just www.blah, add the http:// to avoid confusing nutscrape */ - if (*ret == 'w' && *(ret + 1) == 'w' && *(ret + 2) == 'w') + if ((*ret == 'w') && (*(ret + 1) == 'w') && (*(ret + 2) == 'w')) { char *temp = _Strjoin(NULL, "http://", ret, NULL); @@ -736,7 +736,7 @@ static void cb_btn_file_url(void *data) { - if (dtext.str && strcmp(dtext.str, "E-UrlWatch")) + if ((dtext.str) && (strcmp(dtext.str, "E-UrlWatch"))) { handle_url(dtext.str, "www"); } Index: E16/epplets/epplets/E-NetGraph.c =================================================================== --- E16/epplets/epplets/E-NetGraph.c (revision 51690) +++ E16/epplets/epplets/E-NetGraph.c (working copy) @@ -158,7 +158,7 @@ if (i >= old_out_y) { - if (old_out_y >= new_out_y || i >= new_out_y) + if ((old_out_y >= new_out_y) || (i >= new_out_y)) intensity = ((float)(39 - i) / (float)(39 - old_out_y)); else intensity = 1 - ((float)(new_out_y - i) / (float) @@ -177,7 +177,7 @@ if (i <= old_in_y) { - if (old_in_y <= new_in_y || i <= new_in_y) + if ((old_in_y <= new_in_y) || (i <= new_in_y)) intensity = ((float)i / (float)old_in_y); else intensity = 1 - ((float)(i - new_in_y) / (float) Index: E16/epplets/epplets/E-PlayCD.c =================================================================== --- E16/epplets/epplets/E-PlayCD.c (revision 51690) +++ E16/epplets/epplets/E-PlayCD.c (working copy) @@ -72,7 +72,7 @@ } else { - if (((start + MAX_LBL_LEN) > (int)strlen(temp)) || start < 0) + if (((start + MAX_LBL_LEN) > (int)strlen(temp)) || (start < 0)) direction = -direction; temp[start + MAX_LBL_LEN] = '\0'; @@ -291,8 +291,8 @@ else current_track--; - if (DiscInfo.disc_mode == CDAUDIO_PLAYING || - DiscInfo.disc_mode == CDAUDIO_PAUSED) + if ((DiscInfo.disc_mode == CDAUDIO_PLAYING) || + (DiscInfo.disc_mode == CDAUDIO_PAUSED)) cd_play(cd_desc, current_track); update_cddb_string(); @@ -315,7 +315,7 @@ current_track++; if ((DiscInfo.disc_mode == CDAUDIO_PLAYING) || - DiscInfo.disc_mode == CDAUDIO_PAUSED) + (DiscInfo.disc_mode == CDAUDIO_PAUSED)) cd_play(cd_desc, current_track); update_cddb_string(); @@ -351,7 +351,7 @@ if (!cd_desc) open_cdrom(cdrom_device); - if ((eplaycd_cd_stat(cd_desc, &DiscInfo) >= 0) && DiscInfo.disc_present) + if ((eplaycd_cd_stat(cd_desc, &DiscInfo) >= 0) && (DiscInfo.disc_present)) { current_track = DiscInfo.disc_current_track; Index: E16/epplets/epplets/mbox.c =================================================================== --- E16/epplets/epplets/mbox.c (revision 51690) +++ E16/epplets/epplets/mbox.c (working copy) @@ -36,7 +36,7 @@ #include #define ISSPACE(c) isspace((unsigned char) c) -#define SKIPWS(c) while (*(c) && isspace((unsigned char) *(c))) c++; +#define SKIPWS(c) while ((*(c)) && (isspace((unsigned char) *(c)))) c++; #define strfcpy(A,B,C) strncpy(A,B,C), *(A+(C)-1)=0 #ifndef TRUE # define TRUE (1) @@ -117,7 +117,7 @@ char *p; size_t l; - if (!s || !*s) + if ((!s) || (!*s)) return 0; l = strlen(s) + 1; p = (char *)malloc(l); @@ -154,7 +154,7 @@ { void *p; - if (!nmemb || !size) + if ((!nmemb) || (!size)) return NULL; p = (void *)calloc(nmemb, size); return p; @@ -173,8 +173,8 @@ for (; 1;) { - if (!fgets(buf, *linelen - offset, f) || /* end of file or */ - (ISSPACE(*line) && !offset)) + if ((!fgets(buf, *linelen - offset, f)) || /* end of file or */ + ((ISSPACE(*line)) && (!offset))) { /* end of headers */ *line = 0; return (line); @@ -188,13 +188,13 @@ * it begins with a non-space */ /* check to see if the next line is a continuation line */ - if ((ch = fgetc(f)) != ' ' && ch != '\t') + if (((ch = fgetc(f)) != ' ') && (ch != '\t')) { ungetc(ch, f); return (line); /* next line is a separate header field or EOH */ } /* eat tabs and spaces from the beginning of the continuation line */ - while ((ch = fgetc(f)) == ' ' || ch == '\t'); + while (((ch = fgetc(f)) == ' ') || (ch == '\t')); ungetc(ch, f); *++buf = ' '; /* string is still terminated because we removed * at least one whitespace char above */ @@ -215,7 +215,7 @@ static const char * next_word(const char *s) { - while (*s && !ISSPACE(*s)) + while ((*s) && (!ISSPACE(*s))) s++; SKIPWS(s); return s; @@ -287,7 +287,7 @@ p += 2; } while (*p != '"'); - while (*p && !ISSPACE(*p)) + while ((*p) && (!ISSPACE(*p))) p++; } else @@ -355,7 +355,7 @@ return 0; /* timezone? */ - if (isalpha((unsigned char)*s) || *s == '+' || *s == '-') + if ((isalpha((unsigned char)*s)) || (*s == '+') || (*s == '-')) { s = next_word(s); if (!*s) @@ -401,7 +401,7 @@ if (!strncmp(buffer, "Status:", 7)) { status = TRUE; - if (!strchr(buffer, 'R') && !strchr(buffer, 'O')) + if ((!strchr(buffer, 'R')) && (!strchr(buffer, 'O'))) { new_cnt++; is_new = TRUE; @@ -474,7 +474,7 @@ file_mtime = 0; return 0; } - if (!force && ((size_t) s.st_size == file_size) + if ((!force) && ((size_t) s.st_size == file_size) && (s.st_mtime == file_mtime)) { D((" -> Mailbox unchanged.\n")); @@ -484,7 +484,7 @@ if ((s.st_size == 0) || (!S_ISREG(s.st_mode))) { D((" -> Mailbox has zero size or is not a regular file.\n")); - if (file_size == 0 && file_mtime == 0 && total_cnt == 0) + if ((file_size == 0) && (file_mtime == 0) && (total_cnt == 0)) { return 0; } @@ -629,7 +629,7 @@ if (s.st_mtime > last_update) last_update = s.st_mtime; - if (!force && (last_update == file_mtime)) + if ((!force) && (last_update == file_mtime)) { D((" -> Mailbox unchanged.\n")); return 0; Index: E16/epplets/epplets/E-Biff.c =================================================================== --- E16/epplets/epplets/E-Biff.c (revision 51690) +++ E16/epplets/epplets/E-Biff.c (working copy) @@ -106,7 +106,7 @@ { if (new_cnt != 0) { - if (new_cnt == 7 && total_cnt == 9) + if ((new_cnt == 7) && (total_cnt == 9)) { Epplet_gadget_hide(nomail); Epplet_gadget_hide(newmail); @@ -249,7 +249,7 @@ strcpy(buff, Epplet_textbox_contents(cfg_tb_sound)); if (strlen(buff)) { - if (!sound || strcmp(sound, buff)) + if ((!sound) || (strcmp(sound, buff))) { Epplet_modify_config("sound", buff); sound = Epplet_query_config("sound"); @@ -271,7 +271,7 @@ strcpy(buff, Epplet_textbox_contents(cfg_tb_boxname)); if (strlen(buff)) { - if (!boxname || strcmp(boxname, buff)) + if ((!boxname) || (strcmp(boxname, buff))) { Epplet_modify_config("boxname", buff); boxname = Epplet_query_config("boxname"); Index: E16/epplets/epplets/E-OpenGL-Demo.c =================================================================== --- E16/epplets/epplets/E-OpenGL-Demo.c (revision 51690) +++ E16/epplets/epplets/E-OpenGL-Demo.c (working copy) @@ -324,12 +324,12 @@ newLighting = (int *)data; - if (gLighting && !*(newLighting)) + if ((gLighting) && (!*(newLighting))) { /* Lighting was on, turn it off */ gLighting = OFF; disable_lighting(); } - else if (!gLighting && *newLighting && (gWhichRotate = CUBE)) + else if ((!gLighting) && (*newLighting) && (gWhichRotate = CUBE)) { /* Lighting was off, turn it on */ gLighting = ON; enable_lighting(); @@ -348,13 +348,13 @@ newTexturing = (int *)data; - if (gTexturing && !*(newTexturing)) + if ((gTexturing) && (!*(newTexturing))) { /* Texturing was on, turn it off */ gTexturing = OFF; if (gWhichRotate == CUBE) setup_rotating_cube(); } - else if (!gTexturing && *newTexturing && (gWhichRotate == CUBE)) + else if ((!gTexturing) && (*newTexturing) && (gWhichRotate == CUBE)) { /* Texturing was off, turn it on */ gTexturing = ON; setup_rotating_cube(); @@ -510,7 +510,7 @@ /* Sstup the default lighting */ - if (gLighting && gWhichRotate != SQUARE) + if ((gLighting) && (gWhichRotate != SQUARE)) enable_lighting(); /* Compile the display lists */ Index: E16/epplets/epplets/E-Mountbox.c =================================================================== --- E16/epplets/epplets/E-Mountbox.c (revision 51690) +++ E16/epplets/epplets/E-Mountbox.c (working copy) @@ -814,11 +814,11 @@ int linear; unsigned char *data; - if (!im || x < 0 || y < 0) + if ((!im) || (x < 0) || (y < 0)) return 0; imlib_context_set_image(im); - if (x >= imlib_image_get_width() || y >= imlib_image_get_height()) + if ((x >= imlib_image_get_width()) || (y >= imlib_image_get_height())) return 0; linear = 4 * (y * imlib_image_get_width() + x); @@ -911,7 +911,7 @@ if (path) tail_tile->mountpoint->path = strdup(path); } - if (device && path) + if ((device) && (path)) { tmp_path = strdup(path); tmp_dev = strdup(device); @@ -919,7 +919,7 @@ tmp_path[i] = (char)(tolower(tmp_path[i])); for (i = 0; i < (int)strlen(tmp_dev); i++) tmp_dev[i] = (char)(tolower(tmp_dev[i])); - if (tmp_path && tmp_dev) + if ((tmp_path) && (tmp_dev)) { type = types; while (type) @@ -1056,7 +1056,7 @@ if (mpt) { /* is it in the middle */ - if (mpt->next && mpt->prev) + if ((mpt->next) && (mpt->prev)) { mpt->prev->next = mpt->next; mpt->next->prev = mpt->prev; @@ -1250,7 +1250,7 @@ for (; fgets(s, sizeof(s), f);) { /* skip comments and blank lines */ - if (!(*s) || (*s == '\n') || (*s == '#')) + if ((!(*s)) || (*s == '\n') || (*s == '#')) { continue; } @@ -1299,7 +1299,7 @@ for (; fgets(s, sizeof(s), f);) { /* skip comments and blank lines (shouldn't be there, actually ...) */ - if (!(*s) || (*s == '\n') || (*s == '#')) + if ((!(*s)) || (*s == '\n') || (*s == '#')) { continue; } @@ -1355,7 +1355,7 @@ for (; fgets(s, sizeof(s), f);) { /* skip comments and blank lines (shouldn't be there, actually ...) */ - if (!(*s) || (*s == '\n') || (*s == '#')) + if ((!(*s)) || (*s == '\n') || (*s == '#')) { continue; } @@ -1559,7 +1559,7 @@ Mount(mountpoint); } #ifdef HAVE_EJECT - else if (b == 3 && mode.eject_mode == MANUAL_EJECT) + else if ((b == 3) && (mode.eject_mode == MANUAL_EJECT)) { Esnprintf(s, sizeof(s), "%s %s", EJECT, mountpoint->device); Epplet_run_command(s); @@ -1684,7 +1684,7 @@ if (token) image = strdup(token); - if (key && image) + if ((key) && (image)) { AddMountPointType(key, image); } Index: E16/epplets/epplets/E-Power.c =================================================================== --- E16/epplets/epplets/E-Power.c (revision 51690) +++ E16/epplets/epplets/E-Power.c (working copy) @@ -33,9 +33,9 @@ { struct stat st; - if ((stat("/proc/apm", &st) > -1) && S_ISREG(st.st_mode)) + if ((stat("/proc/apm", &st) > -1) && (S_ISREG(st.st_mode))) cb_timer_apm(data); - else if ((stat("/proc/acpi", &st) > -1) && S_ISDIR(st.st_mode)) + else if ((stat("/proc/acpi", &st) > -1) && (S_ISDIR(st.st_mode))) cb_timer_acpi(data); } @@ -253,7 +253,7 @@ s_ptr = s; - if (bat_flags != 0xff && bat_flags & 0x80) + if ((bat_flags != 0xff) && (bat_flags & 0x80)) { s_ptr += sprintf(s_ptr, "no battery"); } Index: E16/epplets/epplets/E-ScreenShoot_ftp.c =================================================================== --- E16/epplets/epplets/E-ScreenShoot_ftp.c (revision 51690) +++ E16/epplets/epplets/E-ScreenShoot_ftp.c (working copy) @@ -26,8 +26,8 @@ if (-1 == (master = getpt())) return -1; - if (-1 == grantpt(master) || -1 == unlockpt(master) - || !(slave = ptsname(master))) + if ((-1 == grantpt(master)) || (-1 == unlockpt(master)) + || (!(slave = ptsname(master)))) { close(master); return -1; @@ -157,7 +157,7 @@ } line[length] = 0; - for (p = line; p && *p; p = n) + for (p = line; (p) && (*p); p = n) { /* split into lines */ if ((n = strchr(p, '\n')) || (n = strchr(p, '\r'))) Index: E16/epplets/epplets/E-MemWatch.c =================================================================== --- E16/epplets/epplets/E-MemWatch.c (revision 51690) +++ E16/epplets/epplets/E-MemWatch.c (working copy) @@ -144,7 +144,7 @@ total = (unsigned long)swap.total; used = (unsigned long)swap.used; } - while (swap.total == 0 && swap.used == 0 && check++ < 15); + while ((swap.total == 0) && (swap.used == 0) && (check++ < 15)); #else if (kernel_2_6) Index: embryo/src/bin/embryo_cc_sc1.c =================================================================== --- embryo/src/bin/embryo_cc_sc1.c (revision 51690) +++ embryo/src/bin/embryo_cc_sc1.c (working copy) @@ -425,7 +425,7 @@ if (inpf) /* main source file is not closed, do it now */ sc_closesrc(inpf); /* write the binary file (the file is already open) */ - if (errnum == 0 && jmpcode == 0) + if ((errnum == 0) && (jmpcode == 0)) { assert(binf != NULL); sc_resetasm(outf); /* flush and loop back, for reading */ @@ -442,7 +442,7 @@ free(litq); phopt_cleanup(); stgbuffer_cleanup(); - assert(jmpcode != 0 || loctab.next == NULL); /* on normal flow, + assert((jmpcode != 0) || (loctab.next == NULL)); /* on normal flow, * local symbols * should already have been deleted */ delete_symbols(&loctab, 0, TRUE, TRUE); /* delete local variables @@ -611,7 +611,7 @@ for (i = 1; i < argc; i++) { - if (!strcmp (argv[i], "-i") && (i + 1 < argc) && *argv[i + 1]) + if ((!strcmp (argv[i], "-i")) && (i + 1 < argc) && (*argv[i + 1])) { /* include directory */ i++; @@ -626,13 +626,13 @@ insert_path(str); } - else if (!strcmp (argv[i], "-o") && (i + 1 < argc) && *argv[i + 1]) + else if ((!strcmp (argv[i], "-o")) && (i + 1 < argc) && (*argv[i + 1])) { /* output file */ i++; strcpy(oname, argv[i]); /* FIXME */ } - else if (!strcmp (argv[i], "-S") && (i + 1 < argc) && *argv[i + 1]) + else if ((!strcmp (argv[i], "-S")) && (i + 1 < argc) && (*argv[i + 1])) { /* stack size */ i++; @@ -837,7 +837,7 @@ fconst = matchtoken(tCONST); tag = sc_addtag(NULL); tok = lex(&val, &str); - if (tok == tNATIVE || tok == tPUBLIC) + if ((tok == tNATIVE) || (tok == tPUBLIC)) { error(42); /* invalid combination of class specifiers */ break; @@ -858,7 +858,7 @@ fconst = matchtoken(tCONST); tag = sc_addtag(NULL); tok = lex(&val, &str); - if (tok == tNATIVE || tok == tSTOCK || tok == tSTATIC) + if ((tok == tNATIVE) || (tok == tSTOCK) || (tok == tSTATIC)) { error(42); /* invalid combination of class specifiers */ break; @@ -874,7 +874,7 @@ fconst = matchtoken(tCONST); tag = sc_addtag(NULL); tok = lex(&val, &str); - if (tok == tNATIVE || tok == tPUBLIC) + if ((tok == tNATIVE) || (tok == tPUBLIC)) { error(42); /* invalid combination of class specifiers */ break; @@ -931,13 +931,13 @@ assert(curseg == 2); defstorage(); j = 16; /* 16 values per line */ - while (j && k < litidx) + while ((j) && (k < litidx)) { outval(litq[k], FALSE); stgwrite(" "); k++; j--; - if (j == 0 || k >= litidx) + if ((j == 0) || (k >= litidx)) stgwrite("\n"); /* force a newline after 10 dumps */ /* Note: stgwrite() buffers a line until it is complete. It recognizes * the end of line as a sequence of "\n\0", so something like "\n\t" @@ -965,8 +965,8 @@ { outval(0, FALSE); i = (i + 1) % 16; - stgwrite((i == 0 || count == 0) ? "\n" : " "); - if (i == 0 && count > 0) + stgwrite(((i == 0) || (count == 0)) ? "\n" : " "); + if ((i == 0) && (count > 0)) defstorage(); } /* while */ } @@ -988,7 +988,7 @@ { char name[sNAMEMAX + 1]; - if (tok != tSYMBOL && tok != tOPERATOR) + if ((tok != tSYMBOL) && (tok != tOPERATOR)) { if (freading) error(20, symname); /* invalid symbol name */ @@ -1004,7 +1004,7 @@ { assert(strlen(symname) <= sNAMEMAX); strcpy(name, symname); - if (fconst || !newfunc(name, tag, fpublic, fstatic, fstock)) + if ((fconst) || (!newfunc(name, tag, fpublic, fstatic, fstock))) declglb(name, tag, fpublic, fstatic, fstock, fconst); /* if not a static function, try a static variable */ } /* if */ @@ -1060,13 +1060,13 @@ sym = findglb(name); if (!sym) sym = findconst(name); - if (sym && (sym->usage & uDEFINE) != 0) + if ((sym) && ((sym->usage & uDEFINE) != 0)) error(21, name); /* symbol already defined */ ispublic = fpublic; if (name[0] == PUBLIC_CHAR) { ispublic = TRUE; /* implicitly public variable */ - if (stock || fstatic) + if ((stock) || (fstatic)) error(42); /* invalid combination of class specifiers */ } /* if */ while (matchtoken('[')) @@ -1077,7 +1077,7 @@ error(53); /* exceeding maximum number of dimensions */ return; } /* if */ - if (numdim > 0 && dim[numdim - 1] == 0) + if ((numdim > 0) && (dim[numdim - 1] == 0)) error(52); /* only last dimension may be variable length */ size = needsub(&idxtag[numdim]); /* get size; size==0 for * "var[]" */ @@ -1094,8 +1094,8 @@ * for public variables */ cidx = 0; /* only to avoid a compiler warning */ - if (sc_status == statWRITE && sym - && (sym->usage & (uREAD | uWRITTEN | uPUBLIC)) == 0) + if ((sc_status == statWRITE) && (sym) + && ((sym->usage & (uREAD | uWRITTEN | uPUBLIC)) == 0)) { sc_status = statSKIP; cidx = code_idx; @@ -1201,14 +1201,14 @@ * the "nesting level" of local variables to verify the * multi-definition of symbols. */ - if ((sym = findloc(name)) && sym->compound == nestlevel) + if ((sym = findloc(name)) && (sym->compound == nestlevel)) error(21, name); /* symbol already defined */ /* Although valid, a local variable whose name is equal to that * of a global variable or to that of a local variable at a lower * level might indicate a bug. */ - if (((sym = findloc(name)) && sym->compound != nestlevel) - || findglb(name)) + if (((sym = findloc(name)) && (sym->compound != nestlevel)) + || (findglb(name))) error(219, name); /* variable shadows another symbol */ while (matchtoken('[')) { @@ -1218,7 +1218,7 @@ error(53); /* exceeding maximum number of dimensions */ return ident; } /* if */ - if (numdim > 0 && dim[numdim - 1] == 0) + if ((numdim > 0) && (dim[numdim - 1] == 0)) error(52); /* only last dimension may be variable length */ size = needsub(&idxtag[numdim]); /* get size; size==0 for "var[]" */ #if INT_MAX < LONG_MAX @@ -1227,7 +1227,7 @@ #endif dim[numdim++] = (int)size; } /* while */ - if (ident == iARRAY || fstatic) + if ((ident == iARRAY) || (fstatic)) { if (sc_alignnext) { @@ -1315,7 +1315,7 @@ cell first = litq[cur_lit]; int i; - for (i = cur_lit; i < litidx && litq[i] == first; i++) + for (i = cur_lit; (i < litidx) && (litq[i] == first); i++) /* nothing */ ; if (i == litidx) { @@ -1365,7 +1365,7 @@ if (!matchtoken('=')) { - if (ident == iARRAY && dim[numdim - 1] == 0) + if ((ident == iARRAY) && (dim[numdim - 1] == 0)) { /* declared as "myvar[];" which is senseless (note: this *does* make * sense in the case of a iREFARRAY, which is a function parameter) @@ -1423,7 +1423,7 @@ offs += dsize - 1; if (d + 1 < dim[0]) needtoken(','); - if (matchtoken('{') || matchtoken(tSTRING)) + if ((matchtoken('{')) || (matchtoken(tSTRING))) /* expect a '{' or a string */ lexpush(); else @@ -1449,7 +1449,7 @@ int ellips = FALSE; int curlit = litidx; - assert(ident == iARRAY || ident == iREFARRAY); + assert((ident == iARRAY) || (ident == iREFARRAY)); if (matchtoken('{')) { do @@ -1480,7 +1480,7 @@ { cell step = ((litidx - curlit) == 1) ? (cell) 0 : prev1 - prev2; - if (size == 0 || (litidx - curlit) == 0) + if ((size == 0) || ((litidx - curlit) == 0)) error(41); /* invalid ellipsis, array size unknown */ else if ((litidx - curlit) == (int)size) error(18); /* initialisation data exceeds declared size */ @@ -1490,7 +1490,7 @@ stowlit(prev1); } /* while */ } /* if */ - if (fillzero && size > 0) + if ((fillzero) && (size > 0)) { while ((litidx - curlit) < (int)size) stowlit(0); @@ -1665,11 +1665,11 @@ break; } /* if */ tok = lex(&val, &str); /* read in (new) token */ - if (tok != tSYMBOL && tok != tLABEL) + if ((tok != tSYMBOL) && (tok != tLABEL)) error(20, str); /* invalid symbol name */ strcpy(constname, str); /* save symbol name */ size = increment; /* default increment of 'val' */ - if (tok == tLABEL || matchtoken(':')) + if ((tok == tLABEL) || (matchtoken(':'))) constexpr(&size, NULL); /* get size */ if (matchtoken('=')) constexpr(&value, NULL); /* get value */ @@ -1854,7 +1854,7 @@ else if (arg->numtags == 1) tags[count] = arg->tags[0]; } /* if */ - if (opertok == '~' && count == 0) + if ((opertok == '~') && (count == 0)) { if (arg->ident != iREFARRAY) error(73, arg->name); /* must be an array argument */ @@ -1887,7 +1887,7 @@ * not fit the operator */ break; case '-': - if (count != 1 && count != 2) + if ((count != 1) && (count != 2)) error(62); /* number or placement of the operands does * not fit the operator */ break; @@ -1897,8 +1897,8 @@ * not fit the operator */ } /* switch */ - if (tags[0] == 0 - && ((opertok != '=' && tags[1] == 0) || (opertok == '=' && resulttag == 0))) + if ((tags[0] == 0) + && (((opertok != '=') && (tags[1] == 0)) || ((opertok == '=') && (resulttag == 0)))) error(64); /* cannot change predefined operators */ /* change the operator name */ @@ -1937,7 +1937,7 @@ static int check_operatortag(int opertok, int resulttag, char *opername) { - assert(opername != NULL && opername[0] != '\0'); + assert((opername != NULL) && (opername[0] != '\0')); switch (opertok) { case '!': @@ -1982,12 +1982,12 @@ char tagstr1[10], tagstr2[10]; int opertok; - assert(numtags >= 1 && numtags <= 2); + assert((numtags >= 1) && (numtags <= 2)); opertok = (opername[1] == '\0') ? opername[0] : 0; if (opertok == '=') sprintf(symname, "%s%s%s", tag2str(tagstr1, resulttag), opername, tag2str(tagstr2, tag1)); - else if (numtags == 1 || opertok == '~') + else if ((numtags == 1) || (opertok == '~')) sprintf(symname, "%s%s", opername, tag2str(tagstr1, tag1)); else sprintf(symname, "%s%s%s", tag2str(tagstr1, tag1), opername, @@ -2016,7 +2016,7 @@ unary = ptr == fname; /* unary operator if it doesn't start * with a tag name */ } /* if */ - assert(!unary || *tag1 == 0); + assert((!unary) || (*tag1 == 0)); assert(*ptr != '\0'); for (name = opname; !isdigit(*ptr);) *name++ = *ptr++; @@ -2033,8 +2033,8 @@ constvalue *tagsym[2]; int unary; - if (isalpha(*funcname) || *funcname == '_' || *funcname == PUBLIC_CHAR - || *funcname == '\0') + if ((isalpha(*funcname)) || (*funcname == '_') || (*funcname == PUBLIC_CHAR) + || (*funcname == '\0')) { if (dest != funcname) strcpy(dest, funcname); @@ -2053,7 +2053,7 @@ tagsym[0] = find_constval_byval(&tagname_tab, tags[0]); /* special case: the assignment operator has the return value * as the 2nd tag */ - if (opname[0] == '=' && opname[1] == '\0') + if ((opname[0] == '=') && (opname[1] == '\0')) sprintf(dest, "%s:operator%s(%s:)", tagsym[0]->name, opname, tagsym[1]->name); else @@ -2081,13 +2081,13 @@ tok = lex(&val, &str); if (native) { - if (tok == tPUBLIC || tok == tSTOCK || tok == tSTATIC || - (tok == tSYMBOL && *str == PUBLIC_CHAR)) + if ((tok == tPUBLIC) || (tok == tSTOCK) || (tok == tSTATIC) || + ((tok == tSYMBOL) && (*str == PUBLIC_CHAR))) error(42); /* invalid combination of class specifiers */ } else { - if (tok == tPUBLIC || tok == tSTATIC) + if ((tok == tPUBLIC) || (tok == tSTATIC)) tok = lex(&val, &str); } /* if */ if (tok == tOPERATOR) @@ -2099,7 +2099,7 @@ } else { - if (tok != tSYMBOL && freading) + if ((tok != tSYMBOL) && (freading)) { error(10); /* illegal function or declaration */ return; @@ -2210,7 +2210,7 @@ tag = (firsttag >= 0) ? firsttag : sc_addtag(NULL); tok = lex(&val, &str); assert(!fpublic); - if (tok == tNATIVE || (tok == tPUBLIC && stock)) + if ((tok == tNATIVE) || ((tok == tPUBLIC) && (stock))) error(42); /* invalid combination of class specifiers */ if (tok == tOPERATOR) { @@ -2221,7 +2221,7 @@ } else { - if (tok != tSYMBOL && freading) + if ((tok != tSYMBOL) && (freading)) { error(20, str); /* invalid symbol name */ return FALSE; @@ -2273,7 +2273,7 @@ /* so it is not a prototype, proceed */ /* if this is a function that is not referred to (this can only be * detected in the second stage), shut code generation off */ - if (sc_status == statWRITE && (sym->usage & uREAD) == 0) + if ((sc_status == statWRITE) && ((sym->usage & uREAD) == 0)) { sc_status = statSKIP; cidx = code_idx; @@ -2285,7 +2285,7 @@ sym->usage |= uREAD; /* public functions are always "used" */ if (stock) sym->usage |= uSTOCK; - if (opertok != 0 && opererror) + if ((opertok != 0) && (opererror)) sym->usage &= ~uDEFINE; defsymbol(sym->name, iFUNCTN, sGLOBAL, code_idx + opcodes(1) + opargs(3) + nameincells(sym->name), tag); @@ -2370,7 +2370,7 @@ { int i; - for (i = 0; i < a1->numtags && result; i++) + for (i = 0; (i < a1->numtags) && (result); i++) result = a1->tags[i] == a2->tags[i]; } /* if */ if (result) @@ -2387,7 +2387,7 @@ /* also check the dimensions of both arrays */ if (result) result = a1->numdim == a2->numdim; - for (level = 0; result && level < a1->numdim; level++) + for (level = 0; (result) && (level < a1->numdim); level++) result = a1->dim[level] == a2->dim[level]; /* ??? should also check contents of the default array * (these troubles go away in a 2-pass compiler that forbids @@ -2398,12 +2398,12 @@ { if (result) { - if ((a1->hasdefault & uSIZEOF) != 0 - || (a1->hasdefault & uTAGOF) != 0) - result = a1->hasdefault == a2->hasdefault - && strcmp(a1->defvalue.size.symname, - a2->defvalue.size.symname) == 0 - && a1->defvalue.size.level == a2->defvalue.size.level; + if (((a1->hasdefault & uSIZEOF) != 0) + || ((a1->hasdefault & uTAGOF) != 0)) + result = (a1->hasdefault == a2->hasdefault) + && (strcmp(a1->defvalue.size.symname, + a2->defvalue.size.symname) == 0) + && (a1->defvalue.size.level == a2->defvalue.size.level); else result = a1->defvalue.val == a2->defvalue.val; } /* if */ @@ -2457,12 +2457,12 @@ /* nothing */ break; case '&': - if (ident != iVARIABLE || numtags > 0) + if ((ident != iVARIABLE) || (numtags > 0)) error(1, "-identifier-", "&"); ident = iREFERENCE; break; case tCONST: - if (ident != iVARIABLE || numtags > 0) + if ((ident != iVARIABLE) || (numtags > 0)) error(1, "-identifier-", "const"); fconst = TRUE; break; @@ -2478,7 +2478,7 @@ numtags = 0; while (numtags < MAXTAGS) { - if (!matchtoken('_') && !needtoken(tSYMBOL)) + if ((!matchtoken('_')) && (!needtoken(tSYMBOL))) break; tokeninfo(&val, &ptr); tags[numtags++] = sc_addtag(ptr); @@ -2508,7 +2508,7 @@ */ doarg(name, ident, (argcnt + 3) * sizeof(cell), tags, numtags, fpublic, fconst, &arg); - if (fpublic && arg.hasdefault) + if ((fpublic) && (arg.hasdefault)) error(59, name); /* arguments of a public function may not * have a default value */ if ((sym->usage & uPROTOTYPED) == 0) @@ -2526,15 +2526,15 @@ else { /* check the argument with the earlier definition */ - if (argcnt > oldargcnt - || !argcompare(&sym->dim.arglist[argcnt], &arg)) + if ((argcnt > oldargcnt) + || (!argcompare(&sym->dim.arglist[argcnt], &arg))) error(25); /* function definition does not match prototype */ /* may need to free default array argument and the tag list */ - if (arg.ident == iREFARRAY && arg.hasdefault) + if ((arg.ident == iREFARRAY) && (arg.hasdefault)) free(arg.defvalue.array.data); - else if (arg.ident == iVARIABLE - && ((arg.hasdefault & uSIZEOF) != 0 - || (arg.hasdefault & uTAGOF) != 0)) + else if ((arg.ident == iVARIABLE) + && (((arg.hasdefault & uSIZEOF) != 0) + || ((arg.hasdefault & uTAGOF) != 0))) free(arg.defvalue.size.symname); free(arg.tags); } /* if */ @@ -2572,8 +2572,8 @@ } else { - if (argcnt > oldargcnt - || sym->dim.arglist[argcnt].ident != iVARARGS) + if ((argcnt > oldargcnt) + || (sym->dim.arglist[argcnt].ident != iVARARGS)) error(25); /* function definition does not match prototype */ } /* if */ argcnt++; @@ -2582,17 +2582,17 @@ error(10); /* illegal function or declaration */ } /* switch */ } - while (tok == '&' || tok == tLABEL || tok == tCONST || (tok != tELLIPS && matchtoken(','))); /* more? */ + while ((tok == '&') || (tok == tLABEL) || (tok == tCONST) || ((tok != tELLIPS) && (matchtoken(',')))); /* more? */ /* if the next token is not ",", it should be ")" */ needtoken(')'); } /* if */ /* resolve any "sizeof" arguments (now that all arguments are known) */ assert(sym->dim.arglist != NULL); arglist = sym->dim.arglist; - for (idx = 0; idx < argcnt && arglist[idx].ident != 0; idx++) + for (idx = 0; (idx < argcnt) && (arglist[idx].ident != 0); idx++) { - if ((arglist[idx].hasdefault & uSIZEOF) != 0 - || (arglist[idx].hasdefault & uTAGOF) != 0) + if (((arglist[idx].hasdefault & uSIZEOF) != 0) + || ((arglist[idx].hasdefault & uTAGOF) != 0)) { int altidx; @@ -2602,7 +2602,7 @@ */ ptr = arglist[idx].defvalue.size.symname; for (altidx = 0; - altidx < argcnt && strcmp(ptr, arglist[altidx].name) != 0; + (altidx < argcnt) && (strcmp(ptr, arglist[altidx].name) != 0); altidx++) /* nothing */ ; if (altidx >= argcnt) @@ -2613,16 +2613,16 @@ { /* check the level against the number of dimensions */ /* the level must be zero for "tagof" values */ - assert(arglist[idx].defvalue.size.level == 0 - || (arglist[idx].hasdefault & uSIZEOF) != 0); - if (arglist[idx].defvalue.size.level > 0 - && arglist[idx].defvalue.size.level >= - arglist[altidx].numdim) + assert((arglist[idx].defvalue.size.level == 0) + || ((arglist[idx].hasdefault & uSIZEOF) != 0)); + if ((arglist[idx].defvalue.size.level > 0) + && (arglist[idx].defvalue.size.level >= + arglist[altidx].numdim)) error(28); /* invalid subscript */ if (arglist[altidx].ident != iREFARRAY) { - assert(arglist[altidx].ident == iVARIABLE - || arglist[altidx].ident == iREFERENCE); + assert((arglist[altidx].ident == iVARIABLE) + || (arglist[altidx].ident == iREFERENCE)); error(223, ptr); /* redundant sizeof */ } /* if */ } /* if */ @@ -2721,7 +2721,7 @@ { unsigned char size_tag_token; - assert(ident == iVARIABLE || ident == iREFERENCE); + assert((ident == iVARIABLE) || (ident == iREFERENCE)); arg->hasdefault = TRUE; /* argument has a default value */ size_tag_token = (unsigned char)(matchtoken(tSIZEOF) ? uSIZEOF : 0); @@ -2785,7 +2785,7 @@ } else { - if ((argsym = findglb(name)) && argsym->ident != iFUNCTN) + if ((argsym = findglb(name)) && (argsym->ident != iFUNCTN)) error(219, name); /* variable shadows another symbol */ /* add details of type and address */ assert(numtags > 0); @@ -2832,11 +2832,11 @@ { if (sym->parent) continue; /* hierarchical data type */ - if (sym->ident == iFUNCTN - && (sym->usage & uNATIVE) == 0 - && (sym->usage & uPUBLIC) == 0 - && strcmp(sym->name, uMAINFUNC) != 0 - && count_referrers(sym) == 0) + if ((sym->ident == iFUNCTN) + && ((sym->usage & uNATIVE) == 0) + && ((sym->usage & uPUBLIC) == 0) + && (strcmp(sym->name, uMAINFUNC) != 0) + && (count_referrers(sym) == 0)) { sym->usage &= ~(uREAD | uWRITTEN); /* erase usage bits if * there is no referrer */ @@ -2846,7 +2846,7 @@ if (ref->parent) continue; /* hierarchical data type */ assert(ref->refer != NULL); - for (i = 0; i < ref->numrefers && ref->refer[i] != sym; + for (i = 0; (i < ref->numrefers) && (ref->refer[i] != sym); i++) /* nothing */ ; if (i < ref->numrefers) @@ -2857,9 +2857,9 @@ } /* if */ } /* for */ } - else if ((sym->ident == iVARIABLE || sym->ident == iARRAY) - && (sym->usage & uPUBLIC) == 0 - && !sym->parent && count_referrers(sym) == 0) + else if (((sym->ident == iVARIABLE) || (sym->ident == iARRAY)) + && ((sym->usage & uPUBLIC) == 0) + && (!sym->parent) && (count_referrers(sym) == 0)) { sym->usage &= ~(uREAD | uWRITTEN); /* erase usage bits if * there is no referrer */ @@ -2891,7 +2891,7 @@ symbol *sym = root->next; - while (sym && sym->compound >= level) + while ((sym) && (sym->compound >= level)) { switch (sym->ident) { @@ -2912,12 +2912,12 @@ error(203, symname); /* symbol isn't used ... * (and not native/stock) */ } /* if */ - if ((sym->usage & uPUBLIC) != 0 - || strcmp(sym->name, uMAINFUNC) == 0) + if (((sym->usage & uPUBLIC) != 0) + || (strcmp(sym->name, uMAINFUNC) == 0)) entry = TRUE; /* there is an entry point */ break; case iCONSTEXPR: - if (testconst && (sym->usage & uREAD) == 0) + if ((testconst) && ((sym->usage & uREAD) == 0)) error(203, sym->name); /* symbol isn't used: ... */ break; default: @@ -2949,7 +2949,7 @@ cell length; assert(sym != NULL); - assert(sym->ident == iARRAY || sym->ident == iREFARRAY); + assert((sym->ident == iARRAY) || (sym->ident == iREFARRAY)); length = sym->dim.array.length; if (sym->dim.array.level > 0) { @@ -2977,9 +2977,9 @@ int savepri = FALSE; symbol *sym = root->next; - while (sym && sym->compound >= level) + while ((sym) && (sym->compound >= level)) { - if (sym->ident == iVARIABLE || sym->ident == iARRAY) + if ((sym->ident == iVARIABLE) || (sym->ident == iARRAY)) { char symbolname[16]; symbol *opsym; @@ -3069,7 +3069,7 @@ while (ptr) { - if (strcmp(name, ptr->name) == 0 && ptr->index == index) + if ((strcmp(name, ptr->name) == 0) && (ptr->index == index)) return ptr; ptr = ptr->next; } /* while */ @@ -3186,7 +3186,7 @@ if (tok != '{') setline(fline, fcurrent); /* lex() has set stmtindent */ - if (lastindent && tok != tLABEL) + if ((lastindent) && (tok != tLABEL)) { #if 0 if (*lastindent >= 0 && *lastindent != stmtindent && @@ -3318,9 +3318,9 @@ } else { - if (count_stmt > 0 - && (lastst == tRETURN || lastst == tBREAK - || lastst == tCONTINUE)) + if ((count_stmt > 0) + && ((lastst == tRETURN) || (lastst == tBREAK) + || (lastst == tCONTINUE))) error(225); /* unreachable code */ statement(&indent, TRUE); /* do a statement */ count_stmt++; @@ -3328,7 +3328,7 @@ } /* while */ if (lastst != tRETURN) destructsymbols(&loctab, nestlevel); - if (lastst != tRETURN && lastst != tGOTO) + if ((lastst != tRETURN) && (lastst != tGOTO)) /* delete local variable space */ modstk((int)(declared - save_decl) * sizeof(cell)); @@ -3370,12 +3370,12 @@ endexpr(TRUE); sideeffect = FALSE; ident = expression(&constant, &val, tag, chkfuncresult); - if (!allowarray && (ident == iARRAY || ident == iREFARRAY)) + if ((!allowarray) && ((ident == iARRAY) || (ident == iREFARRAY))) error(33, "-unknown-"); /* array must be indexed */ - if (chkeffect && !sideeffect) + if ((chkeffect) && (!sideeffect)) error(215); /* expression has no effect */ } - while (comma && matchtoken(',')); /* more? */ + while ((comma) && (matchtoken(','))); /* more? */ if (mark_endexpr) endexpr(TRUE); /* optionally, mark the end of the expression */ errorset(sEXPRRELEASE); @@ -3453,7 +3453,7 @@ while (tok); /* do */ if (parens) needtoken(')'); - if (lval.ident == iARRAY || lval.ident == iREFARRAY) + if ((lval.ident == iARRAY) || (lval.ident == iREFARRAY)) { char *ptr = (lval.sym->name) ? lval.sym->name : "-unknown-"; @@ -3479,7 +3479,7 @@ } /* if */ return; } /* if */ - if (lval.tag != 0 && lval.tag != sc_addtag("bool")) + if ((lval.tag != 0) && (lval.tag != sc_addtag("bool"))) if (check_userop(lneg, lval.tag, 0, 1, NULL, &lval.tag)) invert = !invert; /* user-defined ! operator inverted result */ if (invert) @@ -3729,10 +3729,10 @@ * case values at the same time. */ for (csp = &caselist, cse = caselist.next; - cse && cse->value < val; + (cse) && (cse->value < val); csp = cse, cse = cse->next) /* nothing */ ; - if (cse && cse->value == val) + if ((cse) && (cse->value == val)) error(40, val); /* duplicate "case" label */ /* Since the label is stored as a string in the * "constvalue", the size of an identifier must @@ -3755,10 +3755,10 @@ casecount++; /* find the new insertion point */ for (csp = &caselist, cse = caselist.next; - cse && cse->value < val; + (cse) && (cse->value < val); csp = cse, cse = cse->next) /* nothing */ ; - if (cse && cse->value == val) + if ((cse) && (cse->value == val)) error(40, val); /* duplicate "case" label */ insert_constval(csp, cse, itoh(lbl_case), val, 0); } /* if */ @@ -3800,7 +3800,7 @@ /* verify that the case table is sorted (unfortunatly, duplicates can * occur; there really shouldn't be duplicate cases, but the compiler * may not crash or drop into an assertion for a user error). */ - for (cse = caselist.next; cse && cse->next; cse = cse->next) + for (cse = caselist.next; (cse) && (cse->next); cse = cse->next) ; /* empty. no idea whether this is correct, but we MUST NOT do * the setlabel(lbl_table) call in the loop body. doing so breaks * switch statements that only have one case statement following. @@ -4015,7 +4015,7 @@ assert((tag & PUBLICTAG) == 0); for (ptr = tagname_tab.next; - ptr && tag != (int)(ptr->value & TAGMASK); ptr = ptr->next) + (ptr) && (tag != (int)(ptr->value & TAGMASK)); ptr = ptr->next) /* nothing */ ; if (ptr) ptr->value |= PUBLICTAG; Index: embryo/src/bin/embryo_cc_sc2.c =================================================================== --- embryo/src/bin/embryo_cc_sc2.c (revision 51690) +++ embryo/src/bin/embryo_cc_sc2.c (working copy) @@ -101,7 +101,7 @@ } /* if */ ext_idx++; } - while (!fp && ext_idx < (sizeof extensions / sizeof extensions[0])); + while ((!fp) && (ext_idx < (sizeof extensions / sizeof extensions[0]))); if (!fp) { *ext = '\0'; /* restore filename */ @@ -139,9 +139,9 @@ if (try_currentpath) result = plungequalifiedfile(name); - if (try_includepaths && name[0] != DIRSEP_CHAR) + if ((try_includepaths) && (name[0] != DIRSEP_CHAR)) { - for (i = 0; !result && (ptr = get_path(i)); i++) + for (i = 0; (!result) && (ptr = get_path(i)); i++) { char path[PATH_MAX]; @@ -159,7 +159,7 @@ check_empty(char *lptr) { /* verifies that the string contains only whitespace */ - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; if (*lptr != '\0') error(38); /* extra characters on line */ @@ -182,13 +182,13 @@ char name[PATH_MAX], c; int i, result; - while (*lptr <= ' ' && *lptr != 0) /* skip leading whitespace */ + while ((*lptr <= ' ') && (*lptr != 0)) /* skip leading whitespace */ lptr++; - if (*lptr == '<' || *lptr == '\"') + if ((*lptr == '<') || (*lptr == '\"')) { c = (char)((*lptr == '\"') ? '\"' : '>'); /* termination character */ lptr++; - while (*lptr <= ' ' && *lptr != 0) /* skip whitespace after quote */ + while ((*lptr <= ' ') && (*lptr != 0)) /* skip whitespace after quote */ lptr++; } else @@ -197,11 +197,11 @@ } /* if */ i = 0; - while (*lptr != c && *lptr != '\0' && i < sizeof name - 1) /* find the end of the string */ + while ((*lptr != c) && (*lptr != '\0') && (i < sizeof name - 1)) /* find the end of the string */ name[i++] = *lptr++; - while (i > 0 && name[i - 1] <= ' ') + while ((i > 0) && (name[i - 1] <= ' ')) i--; /* strip trailing whitespace */ - assert(i >= 0 && i < sizeof name); + assert((i >= 0) && (i < sizeof name)); name[i] = '\0'; /* zero-terminate the string */ if (*lptr != c) @@ -242,11 +242,11 @@ cont = FALSE; do { - if (!inpf || sc_eofsrc(inpf)) + if ((!inpf) || (sc_eofsrc(inpf))) { if (cont) error(49); /* invalid line continuation */ - if (inpf && inpf != inpf_org) + if ((inpf) && (inpf != inpf_org)) sc_closesrc(inpf); i = (int)(long)popstk(); if (i == -1) @@ -289,21 +289,21 @@ { char *ptr = line; - while (*ptr == ' ' || *ptr == '\t') + while ((*ptr == ' ') || (*ptr == '\t')) ptr++; if (ptr != line) memmove(line, ptr, strlen(ptr) + 1); } /* if */ cont = FALSE; /* check whether a full line was read */ - if (!strchr(line, '\n') && !sc_eofsrc(inpf)) + if ((!strchr(line, '\n')) && (!sc_eofsrc(inpf))) error(75); /* line too long */ /* check if the next line must be concatenated to this line */ - if ((ptr = strchr(line, '\n')) && ptr > line) + if ((ptr = strchr(line, '\n')) && (ptr > line)) { assert(*(ptr + 1) == '\0'); /* '\n' should be last in the string */ - while (ptr > line - && (*ptr == '\n' || *ptr == ' ' || *ptr == '\t')) + while ((ptr > line) + && ((*ptr == '\n') || (*ptr == ' ') || (*ptr == '\t'))) ptr--; /* skip trailing whitespace */ if (*ptr == '\\') { @@ -320,7 +320,7 @@ } /* if */ fline += 1; } - while (num >= 0 && cont); + while ((num >= 0) && (cont)); } /* stripcom @@ -342,7 +342,7 @@ { if (icomment) { - if (*line == '*' && *(line + 1) == '/') + if ((*line == '*') && (*(line + 1) == '/')) { icomment = FALSE; /* comment has ended */ *line = ' '; /* replace '*' and '/' characters by spaces */ @@ -351,7 +351,7 @@ } else { - if (*line == '/' && *(line + 1) == '*') + if ((*line == '/') && (*(line + 1) == '*')) error(216); /* nested comment */ *line = ' '; /* replace comments by spaces */ line += 1; @@ -359,14 +359,14 @@ } else { - if (*line == '/' && *(line + 1) == '*') + if ((*line == '/') && (*(line + 1) == '*')) { icomment = TRUE; /* start comment */ *line = ' '; /* replace '/' and '*' characters by spaces */ *(line + 1) = ' '; line += 2; } - else if (*line == '/' && *(line + 1) == '/') + else if ((*line == '/') && (*(line + 1) == '/')) { /* comment to end of line */ if (strchr(line, '\a')) error(49); /* invalid line continuation */ @@ -375,12 +375,12 @@ } else { - if (*line == '\"' || *line == '\'') + if ((*line == '\"') || (*line == '\'')) { /* leave literals unaltered */ c = *line; /* ending quote, single or double */ line += 1; - while ((*line != c || *(line - 1) == '\\') - && *line != '\0') + while (((*line != c) || (*(line - 1) == '\\')) + && (*line != '\0')) line += 1; line += 1; /* skip final quote */ } @@ -409,10 +409,10 @@ *val = 0; ptr = curptr; - if (*ptr == '0' && *(ptr + 1) == 'b') + if ((*ptr == '0') && (*(ptr + 1) == 'b')) { ptr += 2; - while (*ptr == '0' || *ptr == '1' || *ptr == '_') + while ((*ptr == '0') || (*ptr == '1') || (*ptr == '_')) { if (*ptr != '_') *val = (*val << 1) | (*ptr - '0'); @@ -444,7 +444,7 @@ ptr = curptr; if (!isdigit(*ptr)) /* should start with digit */ return 0; - while (isdigit(*ptr) || *ptr == '_') + while ((isdigit(*ptr)) || (*ptr == '_')) { if (*ptr != '_') *val = (*val * 10) + (*ptr - '0'); @@ -452,7 +452,7 @@ } /* while */ if (alphanum(*ptr)) /* number must be delimited by non-alphanumerical */ return 0; - if (*ptr == '.' && isdigit(*(ptr + 1))) + if ((*ptr == '.') && (isdigit(*(ptr + 1)))) return 0; /* but a fractional part must not be present */ return (int)(ptr - curptr); } @@ -472,10 +472,10 @@ ptr = curptr; if (!isdigit(*ptr)) /* should start with digit */ return 0; - if (*ptr == '0' && *(ptr + 1) == 'x') + if ((*ptr == '0') && (*(ptr + 1) == 'x')) { /* C style hexadecimal notation */ ptr += 2; - while (isxdigit(*ptr) || *ptr == '_') + while ((isxdigit(*ptr)) || (*ptr == '_')) { if (*ptr != '_') { @@ -547,7 +547,7 @@ unsigned long dnum, dbase; int i, ignore; - assert(rational_digits >= 0 && rational_digits < 9); + assert((rational_digits >= 0) && (rational_digits < 9)); for (i = 0, dbase = 1; i < rational_digits; i++) dbase *= 10; fnum = 0.0; @@ -555,7 +555,7 @@ ptr = curptr; if (!isdigit(*ptr)) /* should start with digit */ return 0; - while (isdigit(*ptr) || *ptr == '_') + while ((isdigit(*ptr)) || (*ptr == '_')) { if (*ptr != '_') { @@ -572,7 +572,7 @@ ffrac = 0.0; fmult = 1.0; ignore = FALSE; - while (isdigit(*ptr) || *ptr == '_') + while ((isdigit(*ptr)) || (*ptr == '_')) { if (*ptr != '_') { @@ -580,8 +580,8 @@ fmult = fmult / 10.0; dbase /= 10L; dnum += (*ptr - '0') * dbase; - if (dbase == 0L && sc_rationaltag && rational_digits > 0 - && !ignore) + if ((dbase == 0L) && (sc_rationaltag) && (rational_digits > 0) + && (!ignore)) { error(222); /* number of digits exceeds rational number precision */ ignore = TRUE; @@ -695,9 +695,9 @@ int i; cell value; - if ((i = btoi(&value, curptr)) != 0 /* binary? */ - || (i = htoi(&value, curptr)) != 0 /* hexadecimal? */ - || (i = dtoi(&value, curptr)) != 0) /* decimal? */ + if (((i = btoi(&value, curptr)) != 0) /* binary? */ + || ((i = htoi(&value, curptr)) != 0) /* hexadecimal? */ + || ((i = dtoi(&value, curptr)) != 0)) /* decimal? */ { *val = value; return i; @@ -756,9 +756,9 @@ static char * getstring(char *dest, int max, char *line) { - assert(dest != NULL && line != NULL); + assert((dest != NULL) && (line != NULL)); *dest = '\0'; - while (*line <= ' ' && *line != '\0') + while ((*line <= ' ') && (*line != '\0')) line++; /* skip whitespace */ if (*line != '"') { @@ -769,7 +769,7 @@ int len = 0; line++; /* skip " */ - while (*line != '"' && *line != '\0') + while ((*line != '"') && (*line != '\0')) { if (len < max - 1) dest[len++] = *line; @@ -821,7 +821,7 @@ int index; cell code_index; - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr += 1; if (*lptr == '\0') return CMD_EMPTYLINE; /* empty line */ @@ -833,7 +833,7 @@ /* on a pending expression, force to return a silent ';' token and force to * re-read the line */ - if (!sc_needsemicolon && stgget(&index, &code_index)) + if ((!sc_needsemicolon) && (stgget(&index, &code_index))) { lptr = term_expr; return CMD_TERM; @@ -854,7 +854,7 @@ break; case tpELSE: ret = CMD_IF; - if (iflevel == 0 && skiplevel == 0) + if ((iflevel == 0) && (skiplevel == 0)) { error(26); /* no matching #if */ errorset(sRESET); @@ -898,7 +898,7 @@ #endif case tpENDIF: ret = CMD_IF; - if (iflevel == 0 && skiplevel == 0) + if ((iflevel == 0) && (skiplevel == 0)) { error(26); errorset(sRESET); @@ -945,7 +945,7 @@ check_empty(lptr); break; case tpASSERT: - if (skiplevel == 0 && (sc_debug & sCHKBOUNDS) != 0) + if ((skiplevel == 0) && ((sc_debug & sCHKBOUNDS) != 0)) { preproc_expr(&val, NULL); /* get constant expression (or 0 on error) */ if (!val) @@ -979,7 +979,7 @@ { char name[sNAMEMAX + 1]; - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; if (*lptr == '"') { @@ -989,7 +989,7 @@ { int i; - for (i = 0; i < sizeof name && alphanum(*lptr); + for (i = 0; (i < sizeof name) && (alphanum(*lptr)); i++, lptr++) name[i] = *lptr; name[i] = '\0'; @@ -1022,19 +1022,19 @@ int i; /* first gather all information, start with the tag name */ - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; - for (i = 0; i < sizeof name && alphanum(*lptr); + for (i = 0; (i < sizeof name) && (alphanum(*lptr)); i++, lptr++) name[i] = *lptr; name[i] = '\0'; /* then the precision (for fixed point arithmetic) */ - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; if (*lptr == '(') { preproc_expr(&digits, NULL); - if (digits <= 0 || digits > 9) + if ((digits <= 0) || (digits > 9)) { error(68); /* invalid rational number precision */ digits = 0; @@ -1045,9 +1045,9 @@ /* add the tag (make it public) and check the values */ i = sc_addtag(name); exporttag(i); - if (sc_rationaltag == 0 - || (sc_rationaltag == i - && rational_digits == (int)digits)) + if ((sc_rationaltag == 0) + || ((sc_rationaltag == i) + && (rational_digits == (int)digits))) { sc_rationaltag = i; rational_digits = (int)digits; @@ -1084,9 +1084,9 @@ do { /* get the name */ - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; - for (i = 0; i < sizeof name && isalpha(*lptr); + for (i = 0; (i < sizeof name) && (isalpha(*lptr)); i++, lptr++) name[i] = *lptr; name[i] = '\0'; @@ -1097,10 +1097,10 @@ if (sym) { sym->usage |= uREAD; - if (sym->ident == iVARIABLE - || sym->ident == iREFERENCE - || sym->ident == iARRAY - || sym->ident == iREFARRAY) + if ((sym->ident == iVARIABLE) + || (sym->ident == iREFERENCE) + || (sym->ident == iARRAY) + || (sym->ident == iREFARRAY)) sym->usage |= uWRITTEN; } else @@ -1108,7 +1108,7 @@ error(17, name); /* undefined symbol */ } /* if */ /* see if a comma follows the name */ - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; comma = (*lptr == ','); if (comma) @@ -1146,9 +1146,9 @@ char name[40]; int i; - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; - for (i = 0; i < 40 && (isalpha(*lptr) || *lptr == '.'); i++, lptr++) + for (i = 0; (i < 40) && ((isalpha(*lptr)) || (*lptr == '.')); i++, lptr++) name[i] = (char)tolower(*lptr); name[i] = '\0'; stgwrite("\t"); @@ -1156,7 +1156,7 @@ stgwrite(" "); code_idx += opcodes(1); /* write parameter (if any) */ - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; if (*lptr != '\0') { @@ -1174,9 +1174,9 @@ sym = findloc(str); if (!sym) sym = findglb(str); - if (!sym || (sym->ident != iFUNCTN - && sym->ident != iREFFUNC - && (sym->usage & uDEFINE) == 0)) + if ((!sym) || ((sym->ident != iFUNCTN) + && (sym->ident != iREFFUNC) + && ((sym->usage & uDEFINE) == 0))) { error(17, str); /* undefined symbol */ } @@ -1219,18 +1219,18 @@ stringpair *def; /* find the pattern to match */ - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; start = lptr; /* save starting point of the match pattern */ count = 0; - while (*lptr > ' ' && *lptr != '\0') + while ((*lptr > ' ') && (*lptr != '\0')) { litchar(&lptr, FALSE); /* litchar() advances "lptr" and handles escape characters */ count++; } /* while */ end = lptr; /* check pattern to match */ - if (!isalpha(*start) && *start != '_') + if ((!isalpha(*start)) && (*start != '_')) { error(74); /* pattern must start with an alphabetic character */ break; @@ -1249,11 +1249,11 @@ } /* while */ pattern[count] = '\0'; /* special case, erase trailing variable, because it could match anything */ - if (count >= 2 && isdigit(pattern[count - 1]) - && pattern[count - 2] == '%') + if ((count >= 2) && (isdigit(pattern[count - 1])) + && (pattern[count - 2] == '%')) pattern[count - 2] = '\0'; /* find substitution string */ - while (*lptr <= ' ' && *lptr != '\0') + while ((*lptr <= ' ') && (*lptr != '\0')) lptr++; start = lptr; /* save starting point of the match pattern */ count = 0; @@ -1290,14 +1290,14 @@ substitution[count] = '\0'; /* check whether the definition already exists */ for (prefixlen = 0, start = pattern; - isalpha(*start) || isdigit(*start) || *start == '_'; + (isalpha(*start)) || (isdigit(*start)) || (*start == '_'); prefixlen++, start++) /* nothing */ ; assert(prefixlen > 0); if ((def = find_subst(pattern, prefixlen))) { - if (strcmp(def->first, pattern) != 0 - || strcmp(def->second, substitution) != 0) + if ((strcmp(def->first, pattern) != 0) + || (strcmp(def->second, substitution) != 0)) error(201, pattern); /* redefinition of macro (non-identical) */ delete_subst(pattern, prefixlen); } /* if */ @@ -1336,30 +1336,30 @@ static int is_startstring(char *string) { - if (*string == '\"' || *string == '\'') + if ((*string == '\"') || (*string == '\'')) return TRUE; /* "..." */ if (*string == '!') { string++; - if (*string == '\"' || *string == '\'') + if ((*string == '\"') || (*string == '\'')) return TRUE; /* !"..." */ if (*string == sc_ctrlchar) { string++; - if (*string == '\"' || *string == '\'') + if ((*string == '\"') || (*string == '\'')) return TRUE; /* !\"..." */ } /* if */ } else if (*string == sc_ctrlchar) { string++; - if (*string == '\"' || *string == '\'') + if ((*string == '\"') || (*string == '\'')) return TRUE; /* \"..." */ if (*string == '!') { string++; - if (*string == '\"' || *string == '\'') + if ((*string == '\"') || (*string == '\'')) return TRUE; /* \!"..." */ } /* if */ } /* if */ @@ -1373,16 +1373,16 @@ char endquote; int rawstring = FALSE; - while (*string == '!' || *string == sc_ctrlchar) + while ((*string == '!') || (*string == sc_ctrlchar)) { rawstring = (*string == sc_ctrlchar); string++; } /* while */ endquote = *string; - assert(endquote == '\"' || endquote == '\''); + assert((endquote == '\"') || (endquote == '\'')); string++; /* skip open quote */ - while (*string != endquote && *string != '\0') + while ((*string != endquote) && (*string != '\0')) litchar(&string, rawstring); return string; } @@ -1414,7 +1414,7 @@ } /* switch */ string++; - while (*string != close || nest > 0) + while ((*string != close) || (nest > 0)) { if (*string == open) nest++; @@ -1461,7 +1461,7 @@ memset(args, 0, sizeof args); /* check the length of the prefix */ - for (prefixlen = 0, s = pattern; isalpha(*s) || isdigit(*s) || *s == '_'; + for (prefixlen = 0, s = pattern; (isalpha(*s)) || (isdigit(*s)) || (*s == '_'); prefixlen++, s++) /* nothing */ ; assert(prefixlen > 0); @@ -1473,7 +1473,7 @@ s = line + prefixlen; p = pattern + prefixlen; match = TRUE; /* so far, pattern matches */ - while (match && *s != '\0' && *p != '\0') + while ((match) && (*s != '\0') && (*p != '\0')) { if (*p == '%') { @@ -1481,14 +1481,14 @@ if (isdigit(*p)) { arg = *p - '0'; - assert(arg >= 0 && arg <= 9); + assert((arg >= 0) && (arg <= 9)); p++; /* skip parameter id */ assert(*p != '\0'); /* match the source string up to the character after the digit * (skipping strings in the process */ e = s; - while (*e != *p && *e != '\0' && *e != '\n') + while ((*e != *p) && (*e != '\0') && (*e != '\n')) { if (is_startstring(e)) /* skip strings */ e = skipstring(e); @@ -1512,14 +1512,14 @@ { s = e + 1; } - else if (*e == '\n' && *p == ';' && *(p + 1) == '\0' - && !sc_needsemicolon) + else if ((*e == '\n') && (*p == ';') && (*(p + 1) == '\0') + && (!sc_needsemicolon)) { s = e; /* allow a trailing ; in the pattern match to end of line */ } else { - assert(*e == '\0' || *e == '\n'); + assert((*e == '\0') || (*e == '\n')); match = FALSE; s = e; } /* if */ @@ -1530,12 +1530,12 @@ match = FALSE; } /* if */ } - else if (*p == ';' && *(p + 1) == '\0' && !sc_needsemicolon) + else if ((*p == ';') && (*(p + 1) == '\0') && (!sc_needsemicolon)) { /* source may be ';' or end of the line */ - while (*s <= ' ' && *s != '\0') + while ((*s <= ' ') && (*s != '\0')) s++; /* skip white space */ - if (*s != ';' && *s != '\0') + if ((*s != ';') && (*s != '\0')) match = FALSE; p++; /* skip the semicolon in the pattern */ } @@ -1547,8 +1547,8 @@ * for two identical symbols */ assert(p > pattern); - if (!alphanum(*p) && *(p - 1) != *p) - while (*s <= ' ' && *s != '\0') + if ((!alphanum(*p)) && (*(p - 1) != *p)) + while ((*s <= ' ') && (*s != '\0')) s++; /* skip white space */ ch = litchar(&p, FALSE); /* this increments "p" */ if (*s != ch) @@ -1558,13 +1558,13 @@ } /* if */ } /* while */ - if (match && *p == '\0') + if ((match) && (*p == '\0')) { /* if the last character to match is an alphanumeric character, the * current character in the source may not be alphanumeric */ assert(p > pattern); - if (alphanum(*(p - 1)) && alphanum(*s)) + if ((alphanum(*(p - 1))) && (alphanum(*s))) match = FALSE; } /* if */ @@ -1573,10 +1573,10 @@ /* calculate the length of the substituted string */ for (e = substitution, len = 0; *e != '\0'; e++) { - if (*e == '%' && isdigit(*(e + 1))) + if ((*e == '%') && (isdigit(*(e + 1)))) { arg = *(e + 1) - '0'; - assert(arg >= 0 && arg <= 9); + assert((arg >= 0) && (arg <= 9)); if (args[arg]) len += strlen(args[arg]); e++; /* skip %, digit is skipped later */ @@ -1597,10 +1597,10 @@ strdel(line, (int)(s - line)); for (e = substitution, s = line; *e != '\0'; e++) { - if (*e == '%' && isdigit(*(e + 1))) + if ((*e == '%') && (isdigit(*(e + 1)))) { arg = *(e + 1) - '0'; - assert(arg >= 0 && arg <= 9); + assert((arg >= 0) && (arg <= 9)); if (args[arg]) { strins(s, args[arg], strlen(args[arg])); @@ -1637,7 +1637,7 @@ /* find the start of a prefix (skip all non-alphabetic characters), * also skip strings */ - while (!isalpha(*start) && *start != '_' && *start != '\0') + while ((!isalpha(*start)) && (*start != '_') && (*start != '\0')) { /* skip strings */ if (is_startstring(start)) @@ -1653,7 +1653,7 @@ /* get the prefix (length), look for a matching definition */ prefixlen = 0; end = start; - while (isalpha(*end) || isdigit(*end) || *end == '_') + while ((isalpha(*end)) || (isdigit(*end)) || (*end == '_')) { prefixlen++; end++; @@ -1715,7 +1715,7 @@ } /* if */ #endif } - while (iscommand != CMD_NONE && iscommand != CMD_TERM && freading); /* enddo */ + while ((iscommand != CMD_NONE) && (iscommand != CMD_TERM) && (freading)); /* enddo */ } static char * @@ -1906,7 +1906,7 @@ { stmtindent = 0; for (i = 0; i < (int)(lptr - pline); i++) - if (pline[i] == '\t' && sc_tabsize > 0) + if ((pline[i] == '\t') && (sc_tabsize > 0)) stmtindent += (int)(sc_tabsize - (stmtindent + sc_tabsize) % sc_tabsize); else @@ -1969,21 +1969,21 @@ _lexstr[i] = '\0'; if (toolong) error(200, _lexstr, sNAMEMAX); /* symbol too long, truncated to sNAMEMAX chars */ - if (_lexstr[0] == PUBLIC_CHAR && _lexstr[1] == '\0') + if ((_lexstr[0] == PUBLIC_CHAR) && (_lexstr[1] == '\0')) { _lextok = PUBLIC_CHAR; /* '@' all alone is not a symbol, it is an operator */ } - else if (_lexstr[0] == '_' && _lexstr[1] == '\0') + else if ((_lexstr[0] == '_') && (_lexstr[1] == '\0')) { _lextok = '_'; /* '_' by itself is not a symbol, it is a placeholder */ } /* if */ - if (*lptr == ':' && sc_allowtags && _lextok != PUBLIC_CHAR) + if ((*lptr == ':') && (sc_allowtags) && (_lextok != PUBLIC_CHAR)) { _lextok = tLABEL; /* it wasn't a normal symbol, it was a label/tagname */ lptr += 1; /* skip colon */ } /* if */ } - else if (*lptr == '\"' || (*lptr == sc_ctrlchar && *(lptr + 1) == '\"')) + else if ((*lptr == '\"') || ((*lptr == sc_ctrlchar) && (*(lptr + 1) == '\"'))) { /* unpacked string literal */ _lextok = tSTRING; rawstring = (*lptr == sc_ctrlchar); @@ -1999,13 +1999,13 @@ else error(37); /* invalid (non-terminated) string */ } - else if ((*lptr == '!' && *(lptr + 1) == '\"') - || (*lptr == '!' && *(lptr + 1) == sc_ctrlchar && *(lptr + 2) == '\"') - || (*lptr == sc_ctrlchar && *(lptr + 1) == '!' - && *(lptr + 2) == '\"')) + else if (((*lptr == '!') && (*(lptr + 1) == '\"')) + || ((*lptr == '!') && (*(lptr + 1) == sc_ctrlchar) && (*(lptr + 2) == '\"')) + || ((*lptr == sc_ctrlchar) && (*(lptr + 1) == '!') + && (*(lptr + 2) == '\"'))) { /* packed string literal */ _lextok = tSTRING; - rawstring = (*lptr == sc_ctrlchar || *(lptr + 1) == sc_ctrlchar); + rawstring = ((*lptr == sc_ctrlchar) || (*(lptr + 1) == sc_ctrlchar)); *lexvalue = _lexval = litidx; lptr += 2; /* skip exclamation point and double quote */ if (rawstring) @@ -2091,11 +2091,11 @@ int tok; tok = lex(&val, &str); - if (tok == token || (token == tTERM && (tok == ';' || tok == tENDEXPR))) + if ((tok == token) || ((token == tTERM) && ((tok == ';') || (tok == tENDEXPR)))) { return 1; } - else if (!sc_needsemicolon && token == tTERM && (_lexnewline || !freading)) + else if ((!sc_needsemicolon) && (token == tTERM) && ((_lexnewline) || (!freading))) { lexpush(); /* push "tok" back, we use the "hidden" newline token */ return 1; @@ -2239,7 +2239,7 @@ unsigned char *cptr; cptr = (unsigned char *)*lptr; - if (rawmode || *cptr != sc_ctrlchar) + if ((rawmode) || (*cptr != sc_ctrlchar)) { /* no escape character */ c = *cptr; cptr += 1; @@ -2298,7 +2298,7 @@ if (isdigit(*cptr)) { /* \ddd */ c = 0; - while (*cptr >= '0' && *cptr <= '9') /* decimal! */ + while ((*cptr >= '0') && (*cptr <= '9')) /* decimal! */ c = c * 10 + *cptr++ - '0'; if (*cptr == ';') cptr++; /* swallow a trailing ';' */ @@ -2311,7 +2311,7 @@ } /* if */ } /* if */ *lptr = (char *)cptr; - assert(c >= 0 && c < 256); + assert((c >= 0) && (c < 256)); return c; } @@ -2323,7 +2323,7 @@ static int alpha(char c) { - return (isalpha(c) || c == '_' || c == PUBLIC_CHAR); + return ((isalpha(c)) || (c == '_') || (c == PUBLIC_CHAR)); } /* alphanum @@ -2333,7 +2333,7 @@ int alphanum(char c) { - return (alpha(c) || isdigit(c)); + return ((alpha(c)) || (isdigit(c))); } /* The local variable table must be searched backwards, so that the deepest @@ -2348,7 +2348,7 @@ symbol *newsym; if (sort) - while (root->next && strcmp(entry->name, root->next->name) > 0) + while ((root->next) && (strcmp(entry->name, root->next->name) > 0)) root = root->next; if (!(newsym = (symbol *)malloc(sizeof(symbol)))) @@ -2378,11 +2378,11 @@ assert(sym->dim.arglist != NULL); for (arg = sym->dim.arglist; arg->ident != 0; arg++) { - if (arg->ident == iREFARRAY && arg->hasdefault) + if ((arg->ident == iREFARRAY) && (arg->hasdefault)) free(arg->defvalue.array.data); - else if (arg->ident == iVARIABLE - && ((arg->hasdefault & uSIZEOF) != 0 - || (arg->hasdefault & uTAGOF) != 0)) + else if ((arg->ident == iVARIABLE) + && (((arg->hasdefault & uSIZEOF) != 0) + || ((arg->hasdefault & uTAGOF) != 0))) free(arg->defvalue.size.symname); assert(arg->tags != NULL); free(arg->tags); @@ -2426,16 +2426,16 @@ sym = root->next; if (sym->compound < level) break; - if ((delete_labels || sym->ident != iLABEL) - && (delete_functions || sym->ident != iFUNCTN - || (sym->usage & uNATIVE) != 0) && (delete_functions - || sym->ident != iCONSTEXPR - || (sym->usage & uPREDEF) == - 0) && (delete_functions - || (sym->ident != - iVARIABLE - && sym->ident != - iARRAY))) + if (((delete_labels) || (sym->ident != iLABEL)) + && ((delete_functions) || (sym->ident != iFUNCTN) + || ((sym->usage & uNATIVE) != 0)) && ((delete_functions) + || (sym->ident != iCONSTEXPR) + || ((sym->usage & uPREDEF) == + 0)) && ((delete_functions) + || ((sym->ident != + iVARIABLE) + && (sym->ident != + iARRAY)))) { root->next = sym->next; free_symbol(sym); @@ -2445,16 +2445,16 @@ /* if the function was prototyped, but not implemented in this source, * mark it as such, so that its use can be flagged */ - if (sym->ident == iFUNCTN && (sym->usage & uDEFINE) == 0) + if ((sym->ident == iFUNCTN) && ((sym->usage & uDEFINE) == 0)) sym->usage |= uMISSING; - if (sym->ident == iFUNCTN || sym->ident == iVARIABLE - || sym->ident == iARRAY) + if ((sym->ident == iFUNCTN) || (sym->ident == iVARIABLE) + || (sym->ident == iARRAY)) sym->usage &= ~uDEFINE; /* clear "defined" flag */ /* for user defined operators, also remove the "prototyped" flag, as * user-defined operators *must* be declared before use */ - if (sym->ident == iFUNCTN && !isalpha(*sym->name) - && *sym->name != '_' && *sym->name != PUBLIC_CHAR) + if ((sym->ident == iFUNCTN) && (!isalpha(*sym->name)) + && (*sym->name != '_') && (*sym->name != PUBLIC_CHAR)) sym->usage &= ~uPROTOTYPED; root = sym; /* skip the symbol */ } /* if */ @@ -2486,9 +2486,9 @@ while (ptr) { - if (hash == ptr->hash && strcmp(name, ptr->name) == 0 - && !ptr->parent && (ptr->fnumber < 0 - || ptr->fnumber == fnumber)) + if ((hash == ptr->hash) && (strcmp(name, ptr->name) == 0) + && (!ptr->parent) && ((ptr->fnumber < 0) + || (ptr->fnumber == fnumber))) return ptr; ptr = ptr->next; } /* while */ @@ -2523,7 +2523,7 @@ assert(entry->refer != NULL); /* see if it is already there */ - for (count = 0; count < entry->numrefers && entry->refer[count] != bywhom; + for (count = 0; (count < entry->numrefers) && (entry->refer[count] != bywhom); count++) /* nothing */ ; if (count < entry->numrefers) @@ -2533,7 +2533,7 @@ } /* if */ /* see if there is an empty spot in the referrer list */ - for (count = 0; count < entry->numrefers && entry->refer[count]; + for (count = 0; (count < entry->numrefers) && (entry->refer[count]); count++) /* nothing */ ; assert(count <= entry->numrefers); @@ -2608,9 +2608,9 @@ symbol *sym; sym = find_symbol(&loctab, name, -1); /* try local symbols first */ - if (!sym || sym->ident != iCONSTEXPR) /* not found, or not a constant */ + if ((!sym) || (sym->ident != iCONSTEXPR)) /* not found, or not a constant */ sym = find_symbol(&glbtab, name, fcurrent); - if (!sym || sym->ident != iCONSTEXPR) + if ((!sym) || (sym->ident != iCONSTEXPR)) return NULL; assert(sym->parent == NULL); /* constants have no hierarchy */ return sym; @@ -2638,10 +2638,10 @@ symbol entry, **refer; /* global variables/constants/functions may only be defined once */ - assert(!(ident == iFUNCTN || ident == iCONSTEXPR) || vclass != sGLOBAL - || findglb(name) == NULL); + assert((!((ident == iFUNCTN) || (ident == iCONSTEXPR))) || (vclass != sGLOBAL) + || (findglb(name) == NULL)); /* labels may only be defined once */ - assert(ident != iLABEL || findloc(name) == NULL); + assert((ident != iLABEL) || (findloc(name) == NULL)); /* create an empty referrer list */ if (!(refer = (symbol **)malloc(sizeof(symbol *)))) @@ -2680,10 +2680,10 @@ int level; /* global variables may only be defined once */ - assert(vclass != sGLOBAL || (sym = findglb(name)) == NULL - || (sym->usage & uDEFINE) == 0); + assert((vclass != sGLOBAL) || ((sym = findglb(name)) == NULL) + || ((sym->usage & uDEFINE) == 0)); - if (ident == iARRAY || ident == iREFARRAY) + if ((ident == iARRAY) || (ident == iREFARRAY)) { parent = NULL; sym = NULL; /* to avoid a compiler warning */ @@ -2741,7 +2741,7 @@ val >>= 4; } /* endfor */ i = max - 1; - while (nibble[i] == 0 && i > 0) /* search for highest non-zero nibble */ + while ((nibble[i] == 0) && (i > 0)) /* search for highest non-zero nibble */ i -= 1; while (i >= 0) { Index: embryo/src/bin/embryo_cc_sc3.c =================================================================== --- embryo/src/bin/embryo_cc_sc3.c (revision 51690) +++ embryo/src/bin/embryo_cc_sc3.c (working copy) @@ -146,8 +146,8 @@ /* since user-defined operators on untagged operands are forbidden, we have * a quick exit. */ - assert(numparam == 1 || numparam == 2); - if (tag1 == 0 && (numparam == 1 || tag2 == 0)) + assert((numparam == 1) || (numparam == 2)); + if ((tag1 == 0) && ((numparam == 1) || (tag2 == 0))) return FALSE; savepri = savealt = FALSE; @@ -158,8 +158,8 @@ { /* assignment operator: a special case */ strcpy(opername, "="); - if (lval - && (lval->ident == iARRAYCELL || lval->ident == iARRAYCHAR)) + if ((lval) + && ((lval->ident == iARRAYCELL) || (lval->ident == iARRAYCHAR))) savealt = TRUE; } else @@ -201,14 +201,14 @@ return FALSE; /* create a symbol name from the tags and the operator name */ - assert(numparam == 1 || numparam == 2); + assert((numparam == 1) || (numparam == 2)); operator_symname(symbolname, opername, tag1, tag2, numparam, tag2); swapparams = FALSE; sym = findglb(symbolname); if (!sym /*|| (sym->usage & uDEFINE)==0 */ ) { /* ??? should not check uDEFINE; first pass clears these bits */ /* check for commutative operators */ - if (tag1 == tag2 || !oper || !commutative(oper)) + if ((tag1 == tag2) || (!oper) || (!commutative(oper))) return FALSE; /* not commutative, cannot swap operands */ /* if arrived here, the operator is commutative and the tags are different, * swap tags and try again @@ -222,7 +222,7 @@ } /* if */ /* check existance and the proper declaration of this function */ - if ((sym->usage & uMISSING) != 0 || (sym->usage & uPROTOTYPED) == 0) + if (((sym->usage & uMISSING) != 0) || ((sym->usage & uPROTOTYPED) == 0)) { char symname[2 * sNAMEMAX + 16]; /* allow space for user defined operators */ @@ -245,16 +245,16 @@ /* for increment and decrement operators, the symbol must first be loaded * (and stored back afterwards) */ - if (oper == user_inc || oper == user_dec) + if ((oper == user_inc) || (oper == user_dec)) { assert(!savepri); assert(lval != NULL); - if (lval->ident == iARRAYCELL || lval->ident == iARRAYCHAR) + if ((lval->ident == iARRAYCELL) || (lval->ident == iARRAYCHAR)) push1(); /* save current address in PRI */ rvalue(lval); /* get the symbol's value in PRI */ } /* if */ - assert(!savepri || !savealt); /* either one MAY be set, but not both */ + assert((!savepri) || (!savealt)); /* either one MAY be set, but not both */ if (savepri) { /* the chained comparison operators require that the ALT register is @@ -270,7 +270,7 @@ * call */ assert(lval != NULL); /* this was checked earlier */ - assert(lval->ident == iARRAYCELL || lval->ident == iARRAYCHAR); /* checked earlier */ + assert((lval->ident == iARRAYCELL) || (lval->ident == iARRAYCHAR)); /* checked earlier */ push2(); } /* if */ @@ -311,12 +311,12 @@ assert(resulttag != NULL); *resulttag = sym->tag; /* save tag of the called function */ - if (savepri || savealt) + if ((savepri) || (savealt)) pop2(); /* restore the saved PRI/ALT that into ALT */ - if (oper == user_inc || oper == user_dec) + if ((oper == user_inc) || (oper == user_dec)) { assert(lval != NULL); - if (lval->ident == iARRAYCELL || lval->ident == iARRAYCHAR) + if ((lval->ident == iARRAYCELL) || (lval->ident == iARRAYCHAR)) pop2(); /* restore address (in ALT) */ store(lval); /* store PRI in the symbol */ moveto1(); /* make sure PRI is restored on exit */ @@ -332,7 +332,7 @@ /* if the formal tag is zero and the actual tag is not "fixed", the actual * tag is "coerced" to zero */ - if (!allowcoerce || formaltag != 0 || (actualtag & FIXEDTAG) != 0) + if ((!allowcoerce) || (formaltag != 0) || ((actualtag & FIXEDTAG) != 0)) return FALSE; } /* if */ return TRUE; @@ -402,16 +402,16 @@ { lvalue = plnge1(hier, lval); /* evaluate left expression */ - allconst = allconst && (lval->ident == iCONSTEXPR); + allconst = (allconst) && (lval->ident == iCONSTEXPR); if (allconst) { if (hits) { /* one operator was already found */ if (testfunc == jmp_ne0) - lval->constval = lval->constval || constval; + lval->constval = (lval->constval) || (constval); else - lval->constval = lval->constval && constval; + lval->constval = (lval->constval) && (constval); } /* if */ constval = lval->constval; /* save result accumulated so far */ } /* if */ @@ -483,7 +483,7 @@ { symbol *sym = lval->sym; - if (!sym || (sym->ident != iFUNCTN && sym->ident != iREFFUNC)) + if ((!sym) || ((sym->ident != iFUNCTN) && (sym->ident != iREFFUNC))) return; /* no known symbol, or not a function result */ if ((sym->usage & uDEFINE) != 0) @@ -491,7 +491,7 @@ /* function is defined, can now check the return value (but make an * exception for directly recursive functions) */ - if (sym != curfunc && (sym->usage & uRETVALUE) == 0) + if ((sym != curfunc) && ((sym->usage & uRETVALUE) == 0)) { char symname[2 * sNAMEMAX + 16]; /* allow space for user defined operators */ @@ -526,11 +526,11 @@ count = 0; do { - if (chkbitwise && count++ > 0 && bitwise_opercount != 0) + if ((chkbitwise) && (count++ > 0) && (bitwise_opercount != 0)) error(212); opidx += opoff; /* add offset to index returned by nextop() */ plnge2(op1[opidx], hier, lval, &lval2); - if (op1[opidx] == ob_and || op1[opidx] == ob_or) + if ((op1[opidx] == ob_and) || (op1[opidx] == ob_or)) bitwise_opercount++; if (forcetag) lval->tag = sc_addtag(forcetag); @@ -563,7 +563,7 @@ do { /* same check as in plnge(), but "chkbitwise" is always TRUE */ - if (count > 0 && bitwise_opercount != 0) + if ((count > 0) && (bitwise_opercount != 0)) error(212); if (count > 0) { @@ -668,13 +668,13 @@ */ checkfunction(lval1); checkfunction(lval2); - if (lval1->ident == iARRAY || lval1->ident == iREFARRAY) + if ((lval1->ident == iARRAY) || (lval1->ident == iREFARRAY)) { char *ptr = (lval1->sym) ? lval1->sym->name : "-unknown-"; error(33, ptr); /* array must be indexed */ } - else if (lval2->ident == iARRAY || lval2->ident == iREFARRAY) + else if ((lval2->ident == iARRAY) || (lval2->ident == iREFARRAY)) { char *ptr = (lval2->sym) ? lval2->sym->name : "-unknown-"; @@ -690,7 +690,7 @@ lval1->ident = iEXPRESSION; lval1->constval = 0; } - else if (lval1->ident == iCONSTEXPR && lval2->ident == iCONSTEXPR) + else if ((lval1->ident == iCONSTEXPR) && (lval2->ident == iCONSTEXPR)) { /* only constant expression if both constant */ stgdel(index, cidx); /* scratch generated code and calculate */ @@ -788,7 +788,7 @@ cell length; assert(sym != NULL); - assert(sym->ident == iARRAY || sym->ident == iREFARRAY); + assert((sym->ident == iARRAY) || (sym->ident == iREFARRAY)); length = sym->dim.array.length; if (sym->dim.array.level > 0) { @@ -806,7 +806,7 @@ array_levelsize(symbol * sym, int level) { assert(sym != NULL); - assert(sym->ident == iARRAY || sym->ident == iREFARRAY); + assert((sym->ident == iARRAY) || (sym->ident == iREFARRAY)); assert(level <= sym->dim.array.level); while (level-- > 0) { @@ -844,7 +844,7 @@ if (!lval1->arrayidx) lval1->arrayidx = arrayidx1; lvalue = plnge1(hier13, lval1); - if (lval1->ident != iARRAYCELL && lval1->ident != iARRAYCHAR) + if ((lval1->ident != iARRAYCELL) && (lval1->ident != iARRAYCHAR)) lval1->arrayidx = NULL; if (lval1->ident == iCONSTEXPR) /* load constant here */ const1(lval1->constval); @@ -903,7 +903,7 @@ /* special case, assignment to packed character in a cell is permitted */ lvalue = TRUE; } - else if (lval1->ident == iARRAY || lval1->ident == iREFARRAY) + else if ((lval1->ident == iARRAY) || (lval1->ident == iREFARRAY)) { /* array assignment is permitted too (with restrictions) */ if (oper) @@ -923,8 +923,8 @@ return error(22); /* assignment to const argument */ lval3 = *lval1; /* save symbol to enable storage of expresion result */ lval1->arrayidx = org_arrayidx; /* restore array index pointer */ - if (lval1->ident == iARRAYCELL || lval1->ident == iARRAYCHAR - || lval1->ident == iARRAY || lval1->ident == iREFARRAY) + if ((lval1->ident == iARRAYCELL) || (lval1->ident == iARRAYCHAR) + || (lval1->ident == iARRAY) || (lval1->ident == iREFARRAY)) { /* if indirect fetch: save PRI (cell address) */ if (oper) @@ -934,19 +934,19 @@ } /* if */ lval2.arrayidx = arrayidx2; plnge2(oper, hier14, lval1, &lval2); - if (lval2.ident != iARRAYCELL && lval2.ident != iARRAYCHAR) + if ((lval2.ident != iARRAYCELL) && (lval2.ident != iARRAYCHAR)) lval2.arrayidx = NULL; if (oper) pop2(); - if (!oper && lval3.arrayidx && lval2.arrayidx - && lval3.ident == lval2.ident && lval3.sym == lval2.sym) + if ((!oper) && (lval3.arrayidx) && (lval2.arrayidx) + && (lval3.ident == lval2.ident) && (lval3.sym == lval2.sym)) { int same = TRUE; assert(lval3.arrayidx == arrayidx1); assert(lval2.arrayidx == arrayidx2); for (i = 0; i < sDIMEN_MAX; i++) - same = same && (lval3.arrayidx[i] == lval2.arrayidx[i]); + same = (same) && (lval3.arrayidx[i] == lval2.arrayidx[i]); if (same) error(226, lval3.sym->name); /* self-assignment */ } /* if */ @@ -966,15 +966,15 @@ rvalue(&lval2); /* instead of plnge2(). */ checkfunction(&lval2); /* check whether lval2 and lval3 (old lval1) refer to the same variable */ - if (lval2.ident == iVARIABLE && lval3.ident == lval2.ident - && lval3.sym == lval2.sym) + if ((lval2.ident == iVARIABLE) && (lval3.ident == lval2.ident) + && (lval3.sym == lval2.sym)) { assert(lval3.sym != NULL); error(226, lval3.sym->name); /* self-assignment */ } /* if */ } /* if */ } /* if */ - if (lval3.ident == iARRAY || lval3.ident == iREFARRAY) + if ((lval3.ident == iARRAY) || (lval3.ident == iREFARRAY)) { /* left operand is an array, right operand should be an array variable * of the same size and the same dimension, an array literal (of the @@ -982,7 +982,7 @@ */ int exactmatch = TRUE; - if (lval2.ident != iARRAY && lval2.ident != iREFARRAY) + if ((lval2.ident != iARRAY) && (lval2.ident != iREFARRAY)) error(33, lval3.sym->name); /* array must be indexed */ if (lval2.sym) { @@ -1005,8 +1005,8 @@ } /* if */ if (lval3.sym->dim.array.level != level) return error(48); /* array dimensions must match */ - else if (lval3.sym->dim.array.length < val - || (exactmatch && lval3.sym->dim.array.length > val)) + else if ((lval3.sym->dim.array.length < val) + || ((exactmatch) && (lval3.sym->dim.array.length > val))) return error(47); /* array sizes must match */ if (level > 0) { @@ -1015,7 +1015,7 @@ symbol *sym2 = lval2.sym; int i; - assert(sym1 != NULL && sym2 != NULL); + assert((sym1 != NULL) && (sym2 != NULL)); /* ^^^ sym2 must be valid, because only variables can be * multi-dimensional (there are no multi-dimensional arrays), * sym1 must be valid because it must be an lvalue @@ -1025,7 +1025,7 @@ { sym1 = finddepend(sym1); sym2 = finddepend(sym2); - assert(sym1 != NULL && sym2 != NULL); + assert((sym1 != NULL) && (sym2 != NULL)); /* ^^^ both arrays have the same dimensions (this was checked * earlier) so the dependend should always be found */ @@ -1040,10 +1040,10 @@ else { /* left operand is not an array, right operand should then not be either */ - if (lval2.ident == iARRAY || lval2.ident == iREFARRAY) + if ((lval2.ident == iARRAY) || (lval2.ident == iREFARRAY)) error(6); /* must be assigned to an array */ } /* if */ - if (lval3.ident == iARRAY || lval3.ident == iREFARRAY) + if ((lval3.ident == iARRAY) || (lval3.ident == iREFARRAY)) { memcopy(val * sizeof(cell)); } @@ -1052,7 +1052,7 @@ check_userop(NULL, lval2.tag, lval3.tag, 2, &lval3, &lval2.tag); store(&lval3); /* now, store the expression result */ } /* if */ - if (!oper && !matchtag(lval3.tag, lval2.tag, TRUE)) + if ((!oper) && (!matchtag(lval3.tag, lval2.tag, TRUE))) error(213); /* tagname mismatch (if "oper", warning already given in plunge2()) */ if (lval3.sym) markusage(lval3.sym, uWRITTEN); @@ -1090,15 +1090,15 @@ needtoken(':'); if (hier14(&lval2)) rvalue(&lval2); - array1 = (lval->ident == iARRAY || lval->ident == iREFARRAY); - array2 = (lval2.ident == iARRAY || lval2.ident == iREFARRAY); - if (array1 && !array2) + array1 = ((lval->ident == iARRAY) || (lval->ident == iREFARRAY)); + array2 = ((lval2.ident == iARRAY) || (lval2.ident == iREFARRAY)); + if ((array1) && (!array2)) { char *ptr = (lval->sym->name) ? lval->sym->name : "-unknown-"; error(33, ptr); /* array must be indexed */ } - else if (!array1 && array2) + else if ((!array1) && (array2)) { char *ptr = (lval2.sym->name) ? lval2.sym->name : "-unknown-"; @@ -1256,8 +1256,8 @@ /* make a special check for a constant expression with the tag of a * rational number, so that we can simple swap the sign of that constant. */ - if (lval->ident == iCONSTEXPR && lval->tag == sc_rationaltag - && sc_rationaltag != 0) + if ((lval->ident == iCONSTEXPR) && (lval->tag == sc_rationaltag) + && (sc_rationaltag != 0)) { if (rational_digits == 0) { @@ -1297,11 +1297,11 @@ sym = findloc(st); if (!sym) sym = findglb(st); - if (sym && sym->ident != iFUNCTN && sym->ident != iREFFUNC - && (sym->usage & uDEFINE) == 0) + if ((sym) && (sym->ident != iFUNCTN) && (sym->ident != iREFFUNC) + && ((sym->usage & uDEFINE) == 0)) sym = NULL; /* symbol is not a function, it is in the table, but not "defined" */ val = !!sym; - if (!val && find_subst(st, strlen(st))) + if ((!val) && (find_subst(st, strlen(st)))) val = 1; clear_value(lval); lval->ident = iCONSTEXPR; @@ -1324,14 +1324,14 @@ return error(17, st); /* undefined symbol */ if (sym->ident == iCONSTEXPR) error(39); /* constant symbol has no size */ - else if (sym->ident == iFUNCTN || sym->ident == iREFFUNC) + else if ((sym->ident == iFUNCTN) || (sym->ident == iREFFUNC)) error(72); /* "function" symbol has no size */ else if ((sym->usage & uDEFINE) == 0) return error(17, st); /* undefined symbol (symbol is in the table, but it is "used" only) */ clear_value(lval); lval->ident = iCONSTEXPR; lval->constval = 1; /* preset */ - if (sym->ident == iARRAY || sym->ident == iREFARRAY) + if ((sym->ident == iARRAY) || (sym->ident == iREFARRAY)) { int level; @@ -1341,7 +1341,7 @@ error(28); /* invalid subscript */ else lval->constval = array_levelsize(sym, level); - if (lval->constval == 0 && !strchr(lptr, PREPROC_TERM)) + if ((lval->constval == 0) && (!strchr(lptr, PREPROC_TERM))) error(224, st); /* indeterminate array size in "sizeof" expression */ } /* if */ const1(lval->constval); @@ -1353,7 +1353,7 @@ while (matchtoken('(')) paranthese++; tok = lex(&val, &st); - if (tok != tSYMBOL && tok != tLABEL) + if ((tok != tSYMBOL) && (tok != tLABEL)) return error(20, st); /* illegal symbol name */ if (tok == tLABEL) { @@ -1412,8 +1412,8 @@ * incremening the value, whereas the current value must be in PRI * on exit. */ - saveresult = (lval->ident == iARRAYCELL - || lval->ident == iARRAYCHAR); + saveresult = ((lval->ident == iARRAYCELL) + || (lval->ident == iARRAYCHAR)); if (saveresult) push1(); /* save address in PRI */ rvalue(lval); /* read current value into PRI */ @@ -1432,8 +1432,8 @@ assert(lval->sym != NULL); if ((lval->sym->usage & uCONST) != 0) return error(22); /* assignment to const argument */ - saveresult = (lval->ident == iARRAYCELL - || lval->ident == iARRAYCHAR); + saveresult = ((lval->ident == iARRAYCELL) + || (lval->ident == iARRAYCHAR)); if (saveresult) push1(); /* save address in PRI */ rvalue(lval); /* read current value into PRI */ @@ -1494,10 +1494,10 @@ symtok = tokeninfo(&val, &st); /* get token read by primary() */ restart: sym = lval1->sym; - if (matchtoken('[') || matchtoken('{') || matchtoken('(')) + if ((matchtoken('[')) || (matchtoken('{')) || (matchtoken('('))) { tok = tokeninfo(&val, &st); /* get token read by matchtoken() */ - if (!sym && symtok != tSYMBOL) + if ((!sym) && (symtok != tSYMBOL)) { /* we do not have a valid symbol and we appear not to have read a valid * symbol name (so it is unlikely that we would have read a name of an @@ -1506,7 +1506,7 @@ lexpush(); /* analyse '(', '{' or '[' again later */ return FALSE; } /* if */ - if (tok == '[' || tok == '{') + if ((tok == '[') || (tok == '{')) { /* subscript */ close = (char)((tok == '[') ? ']' : '}'); if (!sym) @@ -1515,13 +1515,13 @@ needtoken(close); return FALSE; } - else if (sym->ident != iARRAY && sym->ident != iREFARRAY) + else if ((sym->ident != iARRAY) && (sym->ident != iREFARRAY)) { error(28); /* cannot subscript, variable is not an array */ needtoken(close); return FALSE; } - else if (sym->dim.array.level > 0 && close != ']') + else if ((sym->dim.array.level > 0) && (close != ']')) { error(51); /* invalid subscript, must use [ ] */ needtoken(close); @@ -1531,7 +1531,7 @@ push1(); /* save base address of the array */ if (hier14(&lval2)) /* create expression for the array index */ rvalue(&lval2); - if (lval2.ident == iARRAY || lval2.ident == iREFARRAY) + if ((lval2.ident == iARRAY) || (lval2.ident == iREFARRAY)) error(33, lval2.sym->name); /* array must be indexed */ needtoken(close); if (!matchtag(sym->x.idxtag, lval2.tag, TRUE)) @@ -1541,15 +1541,15 @@ stgdel(index, cidx); /* scratch generated code */ if (lval1->arrayidx) { /* keep constant index, for checking */ - assert(sym->dim.array.level >= 0 - && sym->dim.array.level < sDIMEN_MAX); + assert((sym->dim.array.level >= 0) + && (sym->dim.array.level < sDIMEN_MAX)); lval1->arrayidx[sym->dim.array.level] = lval2.constval; } /* if */ if (close == ']') { /* normal array index */ - if (lval2.constval < 0 || (sym->dim.array.length != 0 - && sym->dim.array.length <= lval2.constval)) + if ((lval2.constval < 0) || ((sym->dim.array.length != 0) + && (sym->dim.array.length <= lval2.constval))) error(32, sym->name); /* array index out of bounds */ if (lval2.constval != 0) { @@ -1565,10 +1565,10 @@ else { /* character index */ - if (lval2.constval < 0 || (sym->dim.array.length != 0 - && sym->dim.array.length * ((8 * sizeof(cell)) / + if ((lval2.constval < 0) || ((sym->dim.array.length != 0) + && (sym->dim.array.length * ((8 * sizeof(cell)) / charbits) <= - (ucell) lval2.constval)) + (ucell) lval2.constval))) error(32, sym->name); /* array index out of bounds */ if (lval2.constval != 0) { @@ -1604,7 +1604,7 @@ charalign(); /* align character index into array */ } /* if */ /* the indexed item may be another array (multi-dimensional arrays) */ - assert(lval1->sym == sym && sym != NULL); /* should still be set */ + assert((lval1->sym == sym) && (sym != NULL)); /* should still be set */ if (sym->dim.array.level > 0) { assert(close == ']'); /* checked earlier */ @@ -1634,10 +1634,10 @@ } else { /* tok=='(' -> function(...) */ - if (!sym - || (sym->ident != iFUNCTN && sym->ident != iREFFUNC)) + if ((!sym) + || ((sym->ident != iFUNCTN) && (sym->ident != iREFFUNC))) { - if (!sym && sc_status == statFIRST) + if ((!sym) && (sc_status == statFIRST)) { /* could be a "use before declaration"; in that case, create a stub * function so that the usage can be marked. @@ -1662,7 +1662,7 @@ return FALSE; /* result of function call is no lvalue */ } /* if */ } /* if */ - if (sym && lval1->ident == iFUNCTN) + if ((sym) && (lval1->ident == iFUNCTN)) { assert(sym->ident == iFUNCTN); address(sym); @@ -1720,7 +1720,7 @@ assert(strlen(st) < sizeof lastsymbol); strcpy(lastsymbol, st); } /* if */ - if (tok == tSYMBOL && !findconst(st)) + if ((tok == tSYMBOL) && (!findconst(st))) { /* first look for a local variable */ if ((sym = findloc(st))) @@ -1734,7 +1734,7 @@ lval->sym = sym; lval->ident = sym->ident; lval->tag = sym->tag; - if (sym->ident == iARRAY || sym->ident == iREFARRAY) + if ((sym->ident == iARRAY) || (sym->ident == iREFARRAY)) { address(sym); /* get starting address in primary register */ return FALSE; /* return 0 for array (not lvalue) */ @@ -1747,7 +1747,7 @@ /* now try a global variable */ if ((sym = findglb(st))) { - if (sym->ident == iFUNCTN || sym->ident == iREFFUNC) + if ((sym->ident == iFUNCTN) || (sym->ident == iREFFUNC)) { /* if the function is only in the table because it was inserted as a * stub in the first pass (i.e. it was "used" but never declared or @@ -1763,7 +1763,7 @@ lval->sym = sym; lval->ident = sym->ident; lval->tag = sym->tag; - if (sym->ident == iARRAY || sym->ident == iREFARRAY) + if ((sym->ident == iARRAY) || (sym->ident == iREFARRAY)) { address(sym); /* get starting address in primary register */ return FALSE; /* return 0 for array (not lvalue) */ @@ -1779,7 +1779,7 @@ return error(17, st); /* undefined symbol */ } /* endif */ assert(sym != NULL); - assert(sym->ident == iFUNCTN || sym->ident != iREFFUNC); + assert((sym->ident == iFUNCTN) || (sym->ident != iREFFUNC)); lval->sym = sym; lval->ident = sym->ident; lval->tag = sym->tag; @@ -1818,7 +1818,7 @@ assert(size > 0); /* check whether to dump the default array */ assert(dataaddr != NULL); - if (sc_status == statWRITE && *dataaddr < 0) + if ((sc_status == statWRITE) && (*dataaddr < 0)) { int i; @@ -1860,7 +1860,7 @@ { int i; - for (i = 0; arg[i].ident != 0 && arg[i].ident != iVARARGS; i++) + for (i = 0; (arg[i].ident != 0) && (arg[i].ident != iVARARGS); i++) if (strcmp(arg[i].name, name) == 0) return i; return -1; @@ -1945,7 +1945,7 @@ if (matchtoken('_')) { arglist[argpos] = ARG_IGNORED; /* flag argument as "present, but ignored" */ - if (arg[argidx].ident == 0 || arg[argidx].ident == iVARARGS) + if ((arg[argidx].ident == 0) || (arg[argidx].ident == iVARARGS)) { error(202); /* argument count mismatch */ } @@ -1953,7 +1953,7 @@ { error(34, nargs + 1); /* argument has no default value */ } /* if */ - if (arg[argidx].ident != 0 && arg[argidx].ident != iVARARGS) + if ((arg[argidx].ident != 0) && (arg[argidx].ident != iVARARGS)) argidx++; /* The rest of the code to handle default values is at the bottom * of this routine where default values for unspecified parameters @@ -1972,11 +1972,11 @@ break; case iVARARGS: /* always pass by reference */ - if (lval.ident == iVARIABLE || lval.ident == iREFERENCE) + if ((lval.ident == iVARIABLE) || (lval.ident == iREFERENCE)) { assert(lval.sym != NULL); - if ((lval.sym->usage & uCONST) != 0 - && (arg[argidx].usage & uCONST) == 0) + if (((lval.sym->usage & uCONST) != 0) + && ((arg[argidx].usage & uCONST) == 0)) { /* treat a "const" variable passed to a function with a non-const * "variable argument list" as a constant here */ @@ -1995,9 +1995,9 @@ heapalloc++; } /* if */ } - else if (lval.ident == iCONSTEXPR - || lval.ident == iEXPRESSION - || lval.ident == iARRAYCHAR) + else if ((lval.ident == iCONSTEXPR) + || (lval.ident == iEXPRESSION) + || (lval.ident == iARRAYCHAR)) { /* fetch value if needed */ if (lval.ident == iARRAYCHAR) @@ -2020,9 +2020,9 @@ */ break; case iVARIABLE: - if (lval.ident == iLABEL || lval.ident == iFUNCTN - || lval.ident == iREFFUNC || lval.ident == iARRAY - || lval.ident == iREFARRAY) + if ((lval.ident == iLABEL) || (lval.ident == iFUNCTN) + || (lval.ident == iREFFUNC) || (lval.ident == iARRAY) + || (lval.ident == iREFARRAY)) error(35, argidx + 1); /* argument type mismatch */ if (lvalue) rvalue(&lval); /* get value (direct or indirect) */ @@ -2036,12 +2036,12 @@ argidx++; /* argument done */ break; case iREFERENCE: - if (!lvalue || lval.ident == iARRAYCHAR) + if ((!lvalue) || (lval.ident == iARRAYCHAR)) error(35, argidx + 1); /* argument type mismatch */ - if (lval.sym && (lval.sym->usage & uCONST) != 0 - && (arg[argidx].usage & uCONST) == 0) + if ((lval.sym) && ((lval.sym->usage & uCONST) != 0) + && ((arg[argidx].usage & uCONST) == 0)) error(35, argidx + 1); /* argument type mismatch */ - if (lval.ident == iVARIABLE || lval.ident == iREFERENCE) + if ((lval.ident == iVARIABLE) || (lval.ident == iREFERENCE)) { if (lvalue) { @@ -2063,20 +2063,20 @@ markusage(lval.sym, uWRITTEN); break; case iREFARRAY: - if (lval.ident != iARRAY && lval.ident != iREFARRAY - && lval.ident != iARRAYCELL) + if ((lval.ident != iARRAY) && (lval.ident != iREFARRAY) + && (lval.ident != iARRAYCELL)) { error(35, argidx + 1); /* argument type mismatch */ break; } /* if */ - if (lval.sym && (lval.sym->usage & uCONST) != 0 - && (arg[argidx].usage & uCONST) == 0) + if ((lval.sym) && ((lval.sym->usage & uCONST) != 0) + && ((arg[argidx].usage & uCONST) == 0)) error(35, argidx + 1); /* argument type mismatch */ /* Verify that the dimensions match with those in arg[argidx]. * A literal array always has a single dimension. * An iARRAYCELL parameter is also assumed to have a single dimension. */ - if (!lval.sym || lval.ident == iARRAYCELL) + if ((!lval.sym) || (lval.ident == iARRAYCELL)) { if (arg[argidx].numdim != 1) { @@ -2096,11 +2096,11 @@ * function argument; a literal string may be smaller than * the function argument. */ - if ((lval.constval > 0 - && arg[argidx].dim[0] != lval.constval) - || (lval.constval < 0 - && arg[argidx].dim[0] < - -lval.constval)) + if (((lval.constval > 0) + && (arg[argidx].dim[0] != lval.constval)) + || ((lval.constval < 0) + && (arg[argidx].dim[0] < + -lval.constval))) error(47); /* array sizes must match */ } /* if */ } /* if */ @@ -2130,9 +2130,9 @@ while (sym->dim.array.level > 0) { assert(level < sDIMEN_MAX); - if (arg[argidx].dim[level] != 0 - && sym->dim.array.length != - arg[argidx].dim[level]) + if ((arg[argidx].dim[level] != 0) + && (sym->dim.array.length != + arg[argidx].dim[level])) error(47); /* array sizes must match */ append_constval(&arrayszlst, arg[argidx].name, sym->dim.array.length, level); @@ -2143,9 +2143,9 @@ /* the last dimension is checked too, again, unless it is zero */ assert(level < sDIMEN_MAX); assert(sym != NULL); - if (arg[argidx].dim[level] != 0 - && sym->dim.array.length != - arg[argidx].dim[level]) + if ((arg[argidx].dim[level] != 0) + && (sym->dim.array.length != + arg[argidx].dim[level])) error(47); /* array sizes must match */ append_constval(&arrayszlst, arg[argidx].name, sym->dim.array.length, level); @@ -2168,10 +2168,10 @@ if (!needtoken(',')) /* ...should be comma... */ break; /* ...but abort loop if neither */ } - while (!close && freading && !matchtoken(tENDEXPR)); /* do */ + while ((!close) && (freading) && (!matchtoken(tENDEXPR))); /* do */ } /* if */ /* check remaining function arguments (they may have default values) */ - for (argidx = 0; arg[argidx].ident != 0 && arg[argidx].ident != iVARARGS; + for (argidx = 0; (arg[argidx].ident != 0) && (arg[argidx].ident != iVARARGS); argidx++) { if (arglist[argidx] == ARG_DONE) @@ -2179,8 +2179,8 @@ /* in this first stage, we also skip the arguments with uSIZEOF and uTAGOF; * these are handled last */ - if ((arg[argidx].hasdefault & uSIZEOF) != 0 - || (arg[argidx].hasdefault & uTAGOF) != 0) + if (((arg[argidx].hasdefault & uSIZEOF) != 0) + || ((arg[argidx].hasdefault & uTAGOF) != 0)) { assert(arg[argidx].ident == iVARIABLE); continue; @@ -2246,7 +2246,7 @@ /* now a second loop to catch the arguments with default values that are * the "sizeof" or "tagof" of other arguments */ - for (argidx = 0; arg[argidx].ident != 0 && arg[argidx].ident != iVARARGS; + for (argidx = 0; (arg[argidx].ident != 0) && (arg[argidx].ident != iVARARGS); argidx++) { constvalue *asz; @@ -2257,8 +2257,8 @@ stgmark((char)(sEXPRSTART + argidx)); /* mark beginning of new expression in stage */ assert(arg[argidx].ident == iVARIABLE); /* if "sizeof", must be single cell */ /* if unseen, must be "sizeof" or "tagof" */ - assert((arg[argidx].hasdefault & uSIZEOF) != 0 - || (arg[argidx].hasdefault & uTAGOF) != 0); + assert(((arg[argidx].hasdefault & uSIZEOF) != 0) + || ((arg[argidx].hasdefault & uTAGOF) != 0)); if ((arg[argidx].hasdefault & uSIZEOF) != 0) { /* find the argument; if it isn't found, the argument's default value @@ -2347,9 +2347,9 @@ static int commutative(void (*oper) ()) { - return oper == ob_add || oper == os_mult - || oper == ob_eq || oper == ob_ne - || oper == ob_and || oper == ob_xor || oper == ob_or; + return (oper == ob_add) || (oper == os_mult) + || (oper == ob_eq) || (oper == ob_ne) + || (oper == ob_and) || (oper == ob_xor) || (oper == ob_or); } /* constant @@ -2371,7 +2371,7 @@ symbol *sym; tok = lex(&val, &st); - if (tok == tSYMBOL && (sym = findconst(st))) + if ((tok == tSYMBOL) && (sym = findconst(st))) { lval->constval = sym->addr; const1(lval->constval); Index: embryo/src/bin/embryo_cc_sc4.c =================================================================== --- embryo/src/bin/embryo_cc_sc4.c (revision 51690) +++ embryo/src/bin/embryo_cc_sc4.c (working copy) @@ -371,7 +371,7 @@ /* the symbol can be a local array, a global array, or an array * that is passed by reference. */ - if (sym->ident == iREFARRAY || sym->ident == iREFERENCE) + if ((sym->ident == iREFARRAY) || (sym->ident == iREFERENCE)) { /* reference to a variable or to an array; currently this is * always a local variable */ @@ -663,8 +663,8 @@ if ((sym->usage & uNATIVE) != 0) { /* reserve a SYSREQ id if called for the first time */ - if (sc_status == statWRITE && (sym->usage & uREAD) == 0 - && sym->addr >= 0) + if ((sc_status == statWRITE) && ((sym->usage & uREAD) == 0) + && (sym->addr >= 0)) sym->addr = ntv_funcid++; stgwrite("\tsysreq.c "); outval(sym->addr, FALSE); Index: embryo/src/bin/embryo_cc_sc6.c =================================================================== --- embryo/src/bin/embryo_cc_sc6.c (revision 51690) +++ embryo/src/bin/embryo_cc_sc6.c (working copy) @@ -58,7 +58,7 @@ int digit; /* ignore leading whitespace */ - while (*s == ' ' || *s == '\t') + while ((*s == ' ') || (*s == '\t')) s++; /* allow a negation sign to create the two's complement of numbers */ @@ -68,15 +68,15 @@ s++; } /* if */ - assert((*s >= '0' && *s <= '9') || (*s >= 'a' && *s <= 'f') - || (*s >= 'a' && *s <= 'f')); + assert(((*s >= '0') && (*s <= '9')) || ((*s >= 'a') && (*s <= 'f')) + || ((*s >= 'a') && (*s <= 'f'))); for (;;) { - if (*s >= '0' && *s <= '9') + if ((*s >= '0') && (*s <= '9')) digit = *s - '0'; - else if (*s >= 'a' && *s <= 'f') + else if ((*s >= 'a') && (*s <= 'f')) digit = *s - 'a' + 10; - else if (*s >= 'A' && *s <= 'F') + else if ((*s >= 'A') && (*s <= 'F')) digit = *s - 'A' + 10; else break; /* probably whitespace */ @@ -172,15 +172,15 @@ p >>= 7; } /* for */ /* skip leading zeros */ - while (index > 1 && t[index - 1] == 0 - && (t[index - 2] & 0x40) == 0) + while ((index > 1) && (t[index - 1] == 0) + && ((t[index - 2] & 0x40) == 0)) index--; /* skip leading -1s *//* ??? for BIT16, check for index==3 && t[index-1]==0x03 */ - if (index == 5 && t[index - 1] == 0x0f - && (t[index - 2] & 0x40) != 0) + if ((index == 5) && (t[index - 1] == 0x0f) + && ((t[index - 2] & 0x40) != 0)) index--; - while (index > 1 && t[index - 1] == 0x7f - && (t[index - 2] & 0x40) != 0) + while ((index > 1) && (t[index - 1] == 0x7f) + && ((t[index - 2] & 0x40) != 0)) index--; /* write high byte first, write continuation bits */ assert(index > 0); @@ -299,7 +299,7 @@ */ sym = findglb(name); assert(sym != NULL); - assert(sym->ident == iFUNCTN || sym->ident == iREFFUNC); + assert((sym->ident == iFUNCTN) || (sym->ident == iREFFUNC)); assert(sym->vclass == sGLOBAL); p = sym->addr; @@ -318,7 +318,7 @@ ucell p; i = (int)hex2long(params, NULL); - assert(i >= 0 && i < labnum); + assert((i >= 0) && (i < labnum)); if (fbin) { @@ -342,12 +342,12 @@ while (isspace(*params)) params++; len = strlen(params); - while (len > 0 && isspace(params[len - 1])) + while ((len > 0) && (isspace(params[len - 1]))) len--; params[len++] = '\0'; /* zero-terminate */ while (len % sizeof(cell) != 0) params[len++] = '\0'; /* pad with zeros up to full cell */ - assert(len > 0 && len < 256); + assert((len > 0) && (len < 256)); clen = len + sizeof(cell); /* add size of file ordinal */ if (fbin) @@ -368,12 +368,12 @@ int len; unsigned char mclass, type; - for (endptr = params; !isspace(*endptr) && endptr != '\0'; endptr++) + for (endptr = params; (!isspace(*endptr)) && (endptr != '\0'); endptr++) /* nothing */ ; assert(*endptr == ' '); len = (int)(endptr - params); - assert(len > 0 && len < sNAMEMAX); + assert((len > 0) && (len < sNAMEMAX)); /* first get the other parameters from the line */ offset = hex2long(endptr, &endptr); mclass = (unsigned char)hex2long(endptr, &endptr); @@ -396,7 +396,7 @@ #if !defined NDEBUG /* function should start right after the symbolic information */ - if (!fbin && mclass == 0 && type == iFUNCTN) + if ((!fbin) && (mclass == 0) && (type == iFUNCTN)) assert(offset == codeindex + opcodes(1) + opargs(1) + clen); #endif @@ -410,7 +410,7 @@ ucell p; i = (int)hex2long(params, NULL); - assert(i >= 0 && i < labnum); + assert((i >= 0) && (i < labnum)); if (fbin) { @@ -434,7 +434,7 @@ v = hex2long(params, ¶ms); i = (int)hex2long(params, NULL); - assert(i >= 0 && i < labnum); + assert((i >= 0) && (i < labnum)); if (fbin) { @@ -687,14 +687,14 @@ if (sym->ident == iFUNCTN) { assert(strlen(sym->name) <= sNAMEMAX); - if ((sym->usage & uNATIVE) != 0 && (sym->usage & uREAD) != 0 - && sym->addr >= 0) + if (((sym->usage & uNATIVE) != 0) && ((sym->usage & uREAD) != 0) + && (sym->addr >= 0)) { match = ++numnatives; if (!lookup_alias(alias, sym->name)) strcpy(alias, sym->name); } /* if */ - if ((sym->usage & uPUBLIC) != 0 && (sym->usage & uDEFINE) != 0) + if (((sym->usage & uPUBLIC) != 0) && ((sym->usage & uDEFINE) != 0)) { match = ++numpublics; strcpy(alias, sym->name); @@ -814,8 +814,8 @@ count = 0; for (sym = glbtab.next; sym; sym = sym->next) { - if (sym->ident == iFUNCTN - && (sym->usage & uPUBLIC) != 0 && (sym->usage & uDEFINE) != 0) + if ((sym->ident == iFUNCTN) + && ((sym->usage & uPUBLIC) != 0) && ((sym->usage & uDEFINE) != 0)) { assert(sym->vclass == sGLOBAL); func.address = sym->addr; @@ -854,8 +854,8 @@ #endif for (sym = glbtab.next; sym; sym = sym->next) { - if (sym->ident == iFUNCTN && (sym->usage & uNATIVE) != 0 - && (sym->usage & uREAD) != 0 && sym->addr >= 0) + if ((sym->ident == iFUNCTN) && ((sym->usage & uNATIVE) != 0) + && ((sym->usage & uREAD) != 0) && (sym->addr >= 0)) { assert(sym->addr < numnatives); nativelist[(int)sym->addr] = sym; @@ -917,7 +917,7 @@ count = 0; for (sym = glbtab.next; sym; sym = sym->next) { - if (sym->ident == iVARIABLE && (sym->usage & uPUBLIC) != 0) + if ((sym->ident == iVARIABLE) && ((sym->usage & uPUBLIC) != 0)) { assert((sym->usage & uDEFINE) != 0); assert(sym->vclass == sGLOBAL); @@ -991,7 +991,7 @@ /* ignore empty lines */ if (*instr == '\0') continue; - if (tolower(*instr) == 'l' && *(instr + 1) == '.') + if ((tolower(*instr) == 'l') && (*(instr + 1) == '.')) { int lindex = (int)hex2long(instr + 2, NULL); @@ -1003,7 +1003,7 @@ /* get to the end of the instruction (make use of the '\n' that fgets() * added at the end of the line; this way we will *always* drop on a * whitespace character) */ - for (params = instr; *params != '\0' && !isspace(*params); + for (params = instr; (*params != '\0') && (!isspace(*params)); params++) /* nothing */ ; assert(params > instr); @@ -1033,13 +1033,13 @@ instr = skipwhitespace(line); /* ignore empty lines and labels (labels have a special syntax, so these * must be parsed separately) */ - if (*instr == '\0' || (tolower(*instr) == 'l' - && *(instr + 1) == '.')) + if ((*instr == '\0') || ((tolower(*instr) == 'l') + && (*(instr + 1) == '.'))) continue; /* get to the end of the instruction (make use of the '\n' that fgets() * added at the end of the line; this way we will *always* drop on a * whitespace character) */ - for (params = instr; *params != '\0' && !isspace(*params); + for (params = instr; (*params != '\0') && (!isspace(*params)); params++) /* nothing */ ; assert(params > instr); Index: embryo/src/bin/embryo_cc_sc7.c =================================================================== --- embryo/src/bin/embryo_cc_sc7.c (revision 51690) +++ embryo/src/bin/embryo_cc_sc7.c (working copy) @@ -169,8 +169,8 @@ CHECK_STGBUFFER(0); if (staging) { - if (stgidx >= 2 && stgbuf[stgidx - 1] == '\0' - && stgbuf[stgidx - 2] != '\n') + if ((stgidx >= 2) && (stgbuf[stgidx - 1] == '\0') + && (stgbuf[stgidx - 2] != '\n')) stgidx -= 1; /* overwrite last '\0' */ while (*st != '\0') { /* copy to staging buffer */ @@ -185,7 +185,7 @@ CHECK_STGBUFFER(strlen(stgbuf) + strlen(st) + 1); strcat(stgbuf, st); len = strlen(stgbuf); - if (len > 0 && stgbuf[len - 1] == '\n') + if ((len > 0) && (stgbuf[len - 1] == '\n')) { filewrite(stgbuf); stgbuf[0] = '\0'; @@ -303,7 +303,7 @@ else { ptr = start; - while (ptr < end && *ptr != sSTARTREORDER) + while ((ptr < end) && (*ptr != sSTARTREORDER)) ptr += strlen(ptr) + 1; stgopt(start, ptr); start = ptr; @@ -416,7 +416,7 @@ if (sequences[i].replace) strcpy(sequences[i].replace, str); sequences[i].savesize = sequences_cmp[i].savesize; - if (!sequences[i].find || !sequences[i].replace) + if ((!sequences[i].find) || (!sequences[i].replace)) return phopt_cleanup(); } /* for */ @@ -431,7 +431,7 @@ if (sequences) { i = 0; - while (sequences[i].find || sequences[i].replace) + while ((sequences[i].find) || (sequences[i].replace)) { if (sequences[i].find) free(sequences[i].find); @@ -461,7 +461,7 @@ for (var = 0; var < _maxoptvars; var++) symbols[var][0] = '\0'; - while (*start == '\t' || *start == ' ') + while ((*start == '\t') || (*start == ' ')) start++; while (*pattern) { @@ -473,9 +473,9 @@ pattern++; assert(isdigit(*pattern)); var = atoi(pattern) - 1; - assert(var >= 0 && var < _maxoptvars); + assert((var >= 0) && (var < _maxoptvars)); assert(alphanum(*start)); - for (i = 0; start < end && alphanum(*start); i++, start++) + for (i = 0; (start < end) && (alphanum(*start)); i++, start++) { assert(i <= _aliasmax); str[i] = *start; @@ -492,20 +492,20 @@ } /* if */ break; case ' ': - if (*start != '\t' && *start != ' ') + if ((*start != '\t') && (*start != ' ')) return FALSE; - while ((start < end && *start == '\t') || *start == ' ') + while (((start < end) && (*start == '\t')) || (*start == ' ')) start++; break; case '!': - while ((start < end && *start == '\t') || *start == ' ') + while (((start < end) && (*start == '\t')) || (*start == ' ')) start++; /* skip trailing white space */ if (*start != '\n') return FALSE; assert(*(start + 1) == '\0'); start += 2; /* skip '\n' and '\0' */ if (*(pattern + 1) != '\0') - while ((start < end && *start == '\t') || *start == ' ') + while (((start < end) && (*start == '\t')) || (*start == ' ')) start++; /* skip leading white space of next instruction */ break; default: @@ -544,7 +544,7 @@ lptr++; /* skip '%' */ assert(isdigit(*lptr)); var = atoi(lptr) - 1; - assert(var >= 0 && var < _maxoptvars); + assert((var >= 0) && (var < _maxoptvars)); assert(symbols[var][0] != '\0'); /* variable should be defined */ *repl_length += strlen(symbols[var]); break; @@ -577,7 +577,7 @@ pattern++; assert(isdigit(*pattern)); var = atoi(pattern) - 1; - assert(var >= 0 && var < _maxoptvars); + assert((var >= 0) && (var < _maxoptvars)); assert(symbols[var][0] != '\0'); /* variable should be defined */ strcpy(lptr, symbols[var]); lptr += strlen(symbols[var]); @@ -630,7 +630,7 @@ assert(sequences != NULL); while (start < end) { - if ((sc_debug & sNOOPTIMIZE) != 0 || sc_status != statWRITE) + if (((sc_debug & sNOOPTIMIZE) != 0) || (sc_status != statWRITE)) { /* do not match anything if debug-level is maximum */ filewrite(start); Index: embryo/src/bin/embryo_cc_sclist.c =================================================================== --- embryo/src/bin/embryo_cc_sclist.c (revision 51690) +++ embryo/src/bin/embryo_cc_sclist.c (working copy) @@ -48,7 +48,7 @@ cur->first = strdup(first); cur->second = strdup(second); cur->matchlength = matchlength; - if (!cur->first || !cur->second) + if ((!cur->first) || (!cur->second)) { if (cur->first) free(cur->first); @@ -58,7 +58,7 @@ return NULL; } /* if */ /* link the node to the tree, find the position */ - for (pred = root; pred->next && strcmp(pred->next->first, first) < 0; + for (pred = root; (pred->next) && (strcmp(pred->next->first, first) < 0); pred = pred->next) /* nothing */ ; cur->next = pred->next; @@ -93,10 +93,10 @@ assert(matchlength > 0); /* the function cannot handle zero-length comparison */ assert(first != NULL); - while (cur && result <= 0) + while ((cur) && (result <= 0)) { result = (int)*cur->first - (int)*first; - if (result == 0 && matchlength == cur->matchlength) + if ((result == 0) && (matchlength == cur->matchlength)) { result = strncmp(cur->first, first, matchlength); if (result == 0) @@ -190,7 +190,7 @@ { stringlist *cur = includepaths.next; - while (cur && index-- > 0) + while ((cur) && (index-- > 0)) cur = cur->next; if (cur) { @@ -226,10 +226,10 @@ { stringpair *cur; - assert((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_'); - assert('A' < '_' && '_' < 'z'); + assert(((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')) || (c == '_')); + assert(('A' < '_') && ('_' < 'z')); - for (cur = substpair.next; cur && cur->first[0] != c; + for (cur = substpair.next; (cur) && (cur->first[0] != c); cur = cur->next) /* nothing */ ; substindex[(int)c - 'A'] = cur; @@ -255,8 +255,8 @@ assert(name != NULL); assert(length > 0); - assert((*name >= 'A' && *name <= 'Z') || (*name >= 'a' && *name <= 'z') - || *name == '_'); + assert(((*name >= 'A') && (*name <= 'Z')) || ((*name >= 'a') && (*name <= 'z')) + || (*name == '_')); item = substindex[(int)*name - 'A']; if (item) item = find_stringpair(item, name, length); @@ -270,8 +270,8 @@ assert(name != NULL); assert(length > 0); - assert((*name >= 'A' && *name <= 'Z') || (*name >= 'a' && *name <= 'z') - || *name == '_'); + assert(((*name >= 'A') && (*name <= 'Z')) || ((*name >= 'a') && (*name <= 'z')) + || (*name == '_')); item = substindex[(int)*name - 'A']; if (item) item = find_stringpair(item, name, length); Index: BINDINGS/python/python-e_dbus/module.c =================================================================== --- BINDINGS/python/python-e_dbus/module.c (revision 51690) +++ BINDINGS/python/python-e_dbus/module.c (working copy) @@ -78,7 +78,7 @@ ml = dbus_ecore_native_mainloop(NULL); - if (ml && set_as_default) { + if ((ml) && (set_as_default)) { PyObject *func, *res; if (!_dbus_bindings_module) { Index: BINDINGS/perl/common.c =================================================================== --- BINDINGS/perl/common.c (revision 51690) +++ BINDINGS/perl/common.c (working copy) @@ -10,14 +10,14 @@ cb = (_saved_callback *)malloc(sizeof(_saved_callback)); memset(cb, '\0', sizeof(_saved_callback)); - if (func && SvOK(func)) { + if ((func) && (SvOK(func))) { cb->func = newSVsv(func); } else { cb->func = NULL; } - if (data && SvOK(data)) { + if ((data) && (SvOK(data))) { if (SvROK(data)) { cb->data = newSVsv(data); } @@ -51,7 +51,7 @@ PUSHMARK(SP); - if (perl_saved_cb->data && SvOK(perl_saved_cb->data)) { + if ((perl_saved_cb->data) && (SvOK(perl_saved_cb->data))) { if (DEBUG) { fprintf(stderr, "pushing data at %p\n", perl_saved_cb->data); } Index: BINDINGS/javascript/elixir/src/lib/elixir_params.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_params.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_params.c (working copy) @@ -383,7 +383,7 @@ count = elixir_params_count(params); - if (count == 0 && argc == 0) + if ((count == 0) && (argc == 0)) return 1; if (count != argc) @@ -402,10 +402,10 @@ count = elixir_params_count(params); - if (count == 0 && argc == 0) + if ((count == 0) && (argc == 0)) return 1; - if (argc <= count && count < optional) + if ((argc <= count) && (count < optional)) { elixir_lock_cx(cx); JS_ReportError(cx, "Wrong arguments count : %i (%i < %i)", count, optional, argc); Index: BINDINGS/javascript/elixir/src/lib/elixir_module.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_module.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_module.c (working copy) @@ -436,8 +436,8 @@ { elixir_debug_print("Trying: '%s' with '%s' [%i < %i < %i].", el->name, params[0], el->min_param, param, el->max_param); - if (param >= el->min_param - && param <= el->max_param) + if ((param >= el->min_param) + && (param <= el->max_param)) { load = el->func.request(param, params); if (!load) continue ; Index: BINDINGS/javascript/elixir/src/lib/elixir_tracker.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_tracker.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_tracker.c (working copy) @@ -19,7 +19,7 @@ jo = JS_NewObject(cx, cls, NULL, NULL); - if (jo && JS_SetPrivate(cx, jo, ret) == JS_FALSE) + if ((jo) && (JS_SetPrivate(cx, jo, ret) == JS_FALSE)) jo = NULL; elixir_unlock_cx(cx); Index: BINDINGS/javascript/elixir/src/lib/elixir_id.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_id.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_id.c (working copy) @@ -154,16 +154,16 @@ SIGN_RETRIEVE; - for (i = 0; i < ELIXIR_SIGNATURE_SIZE && i < BLOCK_SIZE; ++i) + for (i = 0; (i < ELIXIR_SIGNATURE_SIZE) && (i < BLOCK_SIZE); ++i) sign[i] = out[i]; if (i < ELIXIR_SIGNATURE_SIZE) while (i < ELIXIR_SIGNATURE_SIZE) - for (j = 0; i < ELIXIR_SIGNATURE_SIZE && j < BLOCK_SIZE; ++i, ++j) + for (j = 0; (i < ELIXIR_SIGNATURE_SIZE) && (j < BLOCK_SIZE); ++i, ++j) sign[i] = out[j]; else while (i < BLOCK_SIZE) - for (j = 0; j < ELIXIR_SIGNATURE_SIZE && i < BLOCK_SIZE; ++i, ++j) + for (j = 0; (j < ELIXIR_SIGNATURE_SIZE) && (i < BLOCK_SIZE); ++i, ++j) sign[j] ^= out[i]; SIGN_SHUTDOWN; @@ -251,7 +251,7 @@ void elixir_id_pop(void) { - if (!id || !cid) return ; + if ((!id) || (!cid)) return ; id_active_size--; id[id_active_size] = NULL; Index: BINDINGS/javascript/elixir/src/lib/elixir_void.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_void.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_void.c (working copy) @@ -3,7 +3,7 @@ #include "Elixir.h" #define ELIXIR_VOID_MAGIC 0xDEAD007 -#define ELIXIR_VOID_CHECK(Void) (!Void || Void->magic != ELIXIR_VOID_MAGIC) +#define ELIXIR_VOID_CHECK(Void) ((!Void) || (Void->magic != ELIXIR_VOID_MAGIC)) struct elixir_void_data_s { Index: BINDINGS/javascript/elixir/src/lib/elixir_run.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_run.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_run.c (working copy) @@ -101,7 +101,7 @@ return NULL; gccx->dying = EINA_TRUE; - while (gccx->obj && gccx->main) + while ((gccx->obj) && (gccx->main)) { #ifndef NDEBUG void *tmp = gccx->obj; @@ -112,9 +112,9 @@ assert(tmp != gccx->obj); } - if (force == EINA_TRUE || (gccx->count == 0 && gccx->nested == 0)) // gccx->main + if ((force == EINA_TRUE) || ((gccx->count == 0) && (gccx->nested == 0))) // gccx->main { - if (!(gccx->count == 0 && gccx->nested == 0)) + if (!((gccx->count == 0) && (gccx->nested == 0))) elixir_debug_print("%i with still %i living objects and nested %i times in %p.", force, gccx->count, gccx->nested); if (gccx->save >= 0) { @@ -214,7 +214,7 @@ assert(gccx->save == -1); if (--gccx->nested == 0) JS_ClearContextThread(cx); - if (gccx->delete && gccx->count == 0) + if ((gccx->delete) && (gccx->count == 0)) elixir_unregister_cx(cx, EINA_FALSE); } } @@ -225,7 +225,7 @@ gc_cx_t *gccx; gccx = elixir_get_gccx(cx); - if (gccx && gccx->save >= 0) + if ((gccx) && (gccx->save >= 0)) return EINA_TRUE; return EINA_FALSE; } @@ -236,7 +236,7 @@ gc_cx_t *gccx; gccx = elixir_get_gccx(cx); - if (gccx && gccx->save >= 0) + if ((gccx) && (gccx->save >= 0)) { pthread_mutex_lock(&suspended_lock); suspended_cx = eina_list_remove(suspended_cx, cx); @@ -288,7 +288,7 @@ gc_cx_t *gccx; gccx = elixir_get_gccx(cx); - if (gccx && gccx->dogc) + if ((gccx) && (gccx->dogc)) { JS_SetContextThread(cx); JS_GC(cx); @@ -307,7 +307,7 @@ return ; gccx->count--; - if (gccx->delete && gccx->count == 0) + if ((gccx->delete) && (gccx->count == 0)) elixir_unregister_cx(cx, EINA_FALSE); } @@ -328,7 +328,7 @@ { JSBool ret; - if (!string || !*string) + if ((!string) || (!*string)) return EINA_FALSE; elixir_lock_cx(cx); @@ -348,7 +348,7 @@ { JSBool ret; - if (!string || !*string) + if ((!string) || (!*string)) return EINA_FALSE; elixir_lock_cx(cx); @@ -366,7 +366,7 @@ Eina_Bool elixir_object_register(JSContext *cx, JSObject **obj, void *data) { - if (!obj || !*obj) + if ((!obj) || (!*obj)) return EINA_FALSE; elixir_lock_cx(cx); @@ -394,7 +394,7 @@ { JSBool ret; - if (!obj || !*obj) + if ((!obj) || (!*obj)) return EINA_FALSE; elixir_lock_cx(cx); @@ -919,8 +919,8 @@ exe = JS_GetRuntimePrivate(es->er->rt); - if (eina_array_count_get(exe) > 0 - && strcmp(eina_array_data_get(exe, eina_array_count_get(exe) - 1), file) == 0) + if ((eina_array_count_get(exe) > 0) + && (strcmp(eina_array_data_get(exe, eina_array_count_get(exe) - 1), file) == 0)) file = NULL; if (file) @@ -941,7 +941,7 @@ { free(eina_array_pop(exe)); - if (tracker && eina_array_count_get(exe) > 1) + if ((tracker) && (eina_array_count_get(exe) > 1)) fprintf(tracker, "%s\n", (char*) eina_array_data_get(exe, eina_array_count_get(exe) - 1)); } @@ -982,7 +982,7 @@ Eina_Bool elixir_reset(Elixir_Runtime *er) { - if (!er || !er->em) + if ((!er) || (!er->em)) return EINA_FALSE; if (er->em->func.reset) Index: BINDINGS/javascript/elixir/src/lib/elixir_object.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_object.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_object.c (working copy) @@ -75,8 +75,8 @@ if (!JS_GetProperty(cx, obj, name, &propertie)) return EINA_FALSE; - if (JSVAL_IS_INT(propertie) - || JSVAL_IS_STRING(propertie)) + if ((JSVAL_IS_INT(propertie)) + || (JSVAL_IS_STRING(propertie))) { if (!JS_ValueToInt32(cx, propertie, value)) return EINA_FALSE; @@ -123,8 +123,8 @@ if (!JS_GetProperty(cx, obj, name, &propertie)) return EINA_FALSE; - if (JSVAL_IS_DOUBLE(propertie) - || JSVAL_IS_STRING(propertie)) + if ((JSVAL_IS_DOUBLE(propertie)) + || (JSVAL_IS_STRING(propertie))) { if (!JS_ValueToNumber(cx, propertie, value)) return EINA_FALSE; @@ -314,7 +314,7 @@ Eina_List *l; EINA_LIST_FOREACH(list, l, m) - if (m->val == val && m->type == type) + if ((m->val == val) && (m->type == type)) { elixir_rval_delete(cx, &m->val); free(m); @@ -332,7 +332,7 @@ Eina_List *l; EINA_LIST_FOREACH(*list, l, m) - if (m->val == val && m->type == type) + if ((m->val == val) && (m->type == type)) { *list = eina_list_promote_list(*list, l); return m->data; Index: BINDINGS/javascript/elixir/src/lib/elixir_template.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_template.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_template.c (working copy) @@ -159,7 +159,7 @@ p->out[p->outs++] = '\\'; p->out[p->outs++] = 'n'; } else { - if (c == '\\' || c == '\'') + if ((c == '\\') || (c == '\'')) p->out[p->outs++] = '\\'; p->out[p->outs++] = c; } @@ -256,7 +256,7 @@ return size; } outc(p, c); - if (p->state == JSPT_CODE || p->state == JSPT_EXP) + if ((p->state == JSPT_CODE) || (p->state == JSPT_EXP)) p->next_state = JSPT_EC1; break; Index: BINDINGS/javascript/elixir/src/lib/elixir_eet.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_eet.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_eet.c (working copy) @@ -141,13 +141,13 @@ goto on_error; type = elixir_get_int(cx, tv); - if (!(type > EET_G_UNKNOWN && type < EET_G_LAST)) + if (!((type > EET_G_UNKNOWN) && (type < EET_G_LAST))) goto on_error; ida = JS_Enumerate(cx, obj); if (!ida) goto on_error; - if (type == EET_G_ARRAY && size < 3) + if ((type == EET_G_ARRAY) && (size < 3)) { if (JS_GetElement(cx, descriptor, 1, &cv) == JS_FALSE) goto on_error; @@ -225,7 +225,7 @@ property = JS_GetStringBytes(JSVAL_TO_STRING(id)); /* Lookup inside data, if we can find this property. */ - if (property && JS_LookupProperty(cx, obj, property, &ov) == JS_TRUE) + if ((property) && (JS_LookupProperty(cx, obj, property, &ov) == JS_TRUE)) { JS_LookupProperty(cx, descriptor, property, &dv); @@ -244,8 +244,8 @@ { JSObject *obj; - if (JSVAL_IS_INT(descriptor) - || JSVAL_IS_STRING(descriptor)) + if ((JSVAL_IS_INT(descriptor)) + || (JSVAL_IS_STRING(descriptor))) { int num; Index: BINDINGS/javascript/elixir/src/lib/elixir_file.c =================================================================== --- BINDINGS/javascript/elixir/src/lib/elixir_file.c (revision 51690) +++ BINDINGS/javascript/elixir/src/lib/elixir_file.c (working copy) @@ -64,7 +64,7 @@ const unsigned char *ptr; if (!key) return 0; - for (ptr = (unsigned char *)key; *ptr && length > 0; ptr++, length--) + for (ptr = (unsigned char *)key; (*ptr) && (length > 0); ptr++, length--) hash_num = ((hash_num << 5) + hash_num) ^ (tolower(*ptr)); return (int)hash_num; @@ -376,8 +376,8 @@ result[len] = '\0'; } else - if (p[1] == '.' - && p[2] == '.') + if ((p[1] == '.') + && (p[2] == '.')) { // remove `/../' if (p[3] == '/') Index: BINDINGS/javascript/elixir/src/bin/elixir_main.c =================================================================== --- BINDINGS/javascript/elixir/src/bin/elixir_main.c (revision 51690) +++ BINDINGS/javascript/elixir/src/bin/elixir_main.c (working copy) @@ -32,7 +32,7 @@ start = (!handle) ? environ : handle; - while (*start && strncmp(*start, "ELX_", 4) != 0) + while ((*start) && (strncmp(*start, "ELX_", 4) != 0)) ++start; if (*start) @@ -372,10 +372,10 @@ return 132; /* Useless I believe. */ - if (JSVAL_IS_BOOLEAN(jsret) - || JSVAL_IS_INT(jsret) - || JSVAL_IS_DOUBLE(jsret) - || JSVAL_IS_STRING(jsret)) + if ((JSVAL_IS_BOOLEAN(jsret)) + || (JSVAL_IS_INT(jsret)) + || (JSVAL_IS_DOUBLE(jsret)) + || (JSVAL_IS_STRING(jsret))) if (JS_ValueToInt32(es->er->cx, jsret, &ret) != JS_TRUE) ret = 0; Index: BINDINGS/javascript/elixir/src/bin/elixir_compile_main.c =================================================================== --- BINDINGS/javascript/elixir/src/bin/elixir_compile_main.c (revision 51690) +++ BINDINGS/javascript/elixir/src/bin/elixir_compile_main.c (working copy) @@ -28,7 +28,7 @@ char *key; unsigned int length; - if (argc != 3 && argc != 4) + if ((argc != 3) && (argc != 4)) return 255; elixir_debug_print_switch(ELIXIR_DEBUG_STDERR, NULL); Index: BINDINGS/javascript/elixir/src/modules/security/cmp/cmp_security.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/security/cmp/cmp_security.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/security/cmp/cmp_security.c (working copy) @@ -22,7 +22,7 @@ _elixir_cmp_check(const char *sha1, int sha1_length, const char *sign, int sign_length, const char *cert, int cert_length) { if (!memory) return ELIXIR_CHECK_NOK; - if (!sign || !cert) return ELIXIR_CHECK_NOK; + if ((!sign) || (!cert)) return ELIXIR_CHECK_NOK; if (cert_length != length) return ELIXIR_CHECK_NOK; if (memcmp(cert, memory, length) == 0) Index: BINDINGS/javascript/elixir/src/modules/security/remote/remote_security.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/security/remote/remote_security.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/security/remote/remote_security.c (working copy) @@ -103,13 +103,13 @@ position = 0; /* FIXME: take time into account (better choice) */ - while (poll(&pollfd, 1, KILLD_TCP_TIMEOUT) >= 0 && retry < 30) + while ((poll(&pollfd, 1, KILLD_TCP_TIMEOUT) >= 0) && (retry < 30)) { received = recv(fd, data + position, length - position, MSG_DONTWAIT); if (received == -1) { - if (errno != EAGAIN - && errno != EINTR) + if ((errno != EAGAIN) + && (errno != EINTR)) return 0; } else @@ -546,7 +546,7 @@ tcp_port = getenv("ELIXIR_REMOTE_TCP_PORT"); emask = getenv("ELIXIR_REMOTE_MASK"); key = getenv("ELIXIR_REMOTE_KEY"); - if (!tcp_host || !tcp_port || !key) + if ((!tcp_host) || (!tcp_port) || (!key)) goto on_error; /* 1. dns request. */ Index: BINDINGS/javascript/elixir/src/modules/loaders/eet/eet_loader.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/loaders/eet/eet_loader.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/loaders/eet/eet_loader.c (working copy) @@ -113,13 +113,13 @@ int compiled_length; unsigned int i; - if (param < 1 || param > 3) return NULL; + if ((param < 1) || (param > 3)) return NULL; cipher = NULL; switch (param) { case 1: - if (stack && eina_array_count_get(stack) > 0) + if ((stack) && (eina_array_count_get(stack) > 0)) { top = eina_array_data_get(stack, eina_array_count_get(stack) - 1); filename = top->filename; @@ -155,7 +155,7 @@ /* Use a cache to prevent useless security check. */ lookup = eina_hash_find(cache, filename); - if (lookup && lookup->eet == eet) + if ((lookup) && (lookup->eet == eet)) { eet_close(eet); @@ -264,8 +264,8 @@ on_error: if (result) free(result); - if (content && free_content) free(content); - if (compiled && free_compiled) free(compiled); + if ((content) && (free_content)) free(content); + if ((compiled) && (free_compiled)) free(compiled); if (eet) eet_close(eet); if (section) free(section); free(filename); @@ -303,7 +303,7 @@ free(file->file); } - if (stack && eina_array_count_get(stack) > 0) + if ((stack) && (eina_array_count_get(stack) > 0)) eina_array_pop(stack); if (file->free_content) free(file->content); @@ -352,15 +352,15 @@ signature = eet_identity_signature(file->file->eet, &length); if (!signature) return elixir_id_compute(sign, file->content_length, file->content); - for (i = 0; i < length && i < (int) ELIXIR_SIGNATURE_SIZE; ++i) sign[i] = signature[i]; + for (i = 0; (i < length) && (i < (int) ELIXIR_SIGNATURE_SIZE); ++i) sign[i] = signature[i]; if (i < (int) ELIXIR_SIGNATURE_SIZE) while (i < (int) ELIXIR_SIGNATURE_SIZE) - for (j = 0; j < length && i < (int) ELIXIR_SIGNATURE_SIZE; ++i, ++j) + for (j = 0; (j < length) && (i < (int) ELIXIR_SIGNATURE_SIZE); ++i, ++j) sign[i] = signature[j]; else while (i < length) - for (j = 0; i < length && j < (int) ELIXIR_SIGNATURE_SIZE; ++i, ++j) + for (j = 0; (i < length) && (j < (int) ELIXIR_SIGNATURE_SIZE); ++i, ++j) sign[j] ^= signature[i]; return EINA_TRUE; Index: BINDINGS/javascript/elixir/src/modules/bindings/ecore_download/ecore_download.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/ecore_download/ecore_download.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/ecore_download/ecore_download.c (working copy) @@ -298,7 +298,7 @@ temp = elixir_file_canonicalize(elixir_get_string_bytes(val[1].v.str, NULL)); backup = strdupa(elixir_get_string_bytes(val[2].v.str, NULL)); prefix = basename(backup); - if (!prefix || strlen(prefix) == 0) prefix = "elixir-XXXXXX"; + if ((!prefix) || (strlen(prefix) == 0)) prefix = "elixir-XXXXXX"; edd = ecore_download_directory_new(files, temp, prefix); Index: BINDINGS/javascript/elixir/src/modules/bindings/ecore_con/ecore_con.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/ecore_con/ecore_con.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/ecore_con/ecore_con.c (working copy) @@ -200,7 +200,7 @@ else { /* Detect if it's a string or a possible Eet_Data packet start. */ - if (size >= 4 && ntohl(data[0]) == MAGIC_EET_DATA_PACKET) + if ((size >= 4) && (ntohl(data[0]) == MAGIC_EET_DATA_PACKET)) { uint32_t count; @@ -1627,7 +1627,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return ; elixir_function_start(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/ecore/ecore_module.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/ecore/ecore_module.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/ecore/ecore_module.c (working copy) @@ -237,8 +237,8 @@ { ret = JSVAL_TO_BOOLEAN(val); } - else if (JSVAL_IS_INT(val) - || JSVAL_IS_STRING(val)) + else if ((JSVAL_IS_INT(val)) + || (JSVAL_IS_STRING(val))) { int tmp; @@ -274,7 +274,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return 0; suspended = elixir_function_suspended(cx); @@ -425,14 +425,14 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent) + if ((!cx) || (!parent)) return NULL; elixir_function_start(cx); effs = elixir_void_get_private(data); - if (effs && effs->start) + if ((effs) && (effs->start)) { argv[0] = elixir_void_get_jsval(data); @@ -458,7 +458,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent) + if ((!cx) || (!parent)) return EINA_TRUE; elixir_function_start(cx); @@ -470,7 +470,7 @@ argv[2] = INT_TO_JSVAL(type); argv[3] = elixir_void_get_jsval(event); - if (effs && effs->filter) + if ((effs) && (effs->filter)) { ret = 0; @@ -497,7 +497,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent) + if ((!cx) || (!parent)) return ; elixir_function_start(cx); @@ -507,7 +507,7 @@ argv[0] = elixir_void_get_jsval(data); argv[1] = elixir_void_get_jsval(loop_data); - if (effs && effs->end) + if ((effs) && (effs->end)) elixir_function_run(cx, effs->end, parent, 2, argv, &js_return); elixir_void_free(loop_data); @@ -580,7 +580,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent) + if ((!cx) || (!parent)) return ECORE_CALLBACK_CANCEL; elixir_function_start(cx); @@ -588,7 +588,7 @@ argv[0] = elixir_void_get_jsval(data); eeh = elixir_void_get_private(data); - if (eeh && eeh->cb) + if ((eeh) && (eeh->cb)) { eeh->running = EINA_TRUE; @@ -599,7 +599,7 @@ } /* The event will be deleted after this call, cleaning memory is a good idea. */ - if (eeh && (!ret || eeh->delete)) + if ((eeh) && ((!ret) || (eeh->delete))) { JS_SetPrivate(cx, eeh->obj, NULL); @@ -885,8 +885,8 @@ parent = elixir_void_get_parent(data); dt = elixir_void_get_private(data); - if (!parent - || !dt) + if ((!parent) + || (!dt)) goto on_error; argv[0] = elixir_void_get_jsval(data); @@ -930,8 +930,8 @@ parent = elixir_void_get_parent(data); dt = elixir_void_get_private(data); - if (!parent - || !dt) + if ((!parent) + || (!dt)) return ; cx = dt->main; @@ -960,8 +960,8 @@ parent = elixir_void_get_parent(data); dt = elixir_void_get_private(data); - if (!parent - || !dt) + if ((!parent) + || (!dt)) return ; cx = dt->main; @@ -1061,7 +1061,7 @@ cb = elixir_void_get_private(data); cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return ; elixir_function_start(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/mix/mixer_module.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/mix/mixer_module.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/mix/mixer_module.c (working copy) @@ -257,7 +257,7 @@ parent = elixir_void_get_parent(callback_context); cx = elixir_void_get_cx(callback_context); - if (!parent || !cx) + if ((!parent) || (!cx)) return ; suspended = elixir_function_suspended(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-textblock.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-textblock.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-textblock.c (working copy) @@ -154,7 +154,7 @@ GET_PRIVATE(cx, val[0].v.obj, ts); text = elixir_get_string_bytes(val[1].v.str, &length); - if (text && strlen(text) != length) + if ((text) && (strlen(text) != length)) return JS_FALSE; evas_textblock_style_set(ts, text); Index: BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-events-binding.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-events-binding.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-events-binding.c (working copy) @@ -250,7 +250,7 @@ js_data = elixir_void_get_jsval(data); cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent) + if ((!cx) || (!parent)) return ; suspended = elixir_function_suspended(cx); @@ -327,7 +327,7 @@ js_data = elixir_void_get_jsval(data); cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent) + if ((!cx) || (!parent)) return ; suspended = elixir_function_suspended(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-binding.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-binding.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-binding.c (working copy) @@ -214,7 +214,7 @@ GET_PRIVATE(cx, val[0].v.obj, know); key = elixir_get_string_bytes(val[1].v.str, NULL); - if (key && strncmp(key, "elixir_jsval", 12) == 0) + if ((key) && (strncmp(key, "elixir_jsval", 12) == 0)) return JS_FALSE; elixir_void_free(evas_object_data_get(know, key)); Index: BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-smart.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-smart.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-smart.c (working copy) @@ -90,7 +90,7 @@ jsval argv[1]; func_get_data(obj, &cx, &parent, &esd); - if (!esd || !cx || !parent) + if ((!esd) || (!cx) || (!parent)) return ; suspended = elixir_function_suspended(cx); @@ -130,7 +130,7 @@ jsval argv[2]; func_get_data(obj1, &cx, &parent, &esd); - if (!esd || !cx || !parent) + if ((!esd) || (!cx) || (!parent)) return ; suspended = elixir_function_suspended(cx); @@ -168,7 +168,7 @@ jsval argv[3]; func_get_data(obj, &cx, &parent, &esd); - if (!esd || !cx || !parent) + if ((!esd) || (!cx) || (!parent)) return ; suspended = elixir_function_suspended(cx); @@ -206,7 +206,7 @@ jsval argv[5]; func_get_data(obj, &cx, &parent, &esd); - if (!esd || !cx || !parent) + if ((!esd) || (!cx) || (!parent)) return ; suspended = elixir_function_suspended(cx); @@ -397,7 +397,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cb || !cx || !parent) + if ((!cb) || (!cx) || (!parent)) return ; suspended = elixir_function_suspended(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-text.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-text.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-text.c (working copy) @@ -43,7 +43,7 @@ font = elixir_get_string_bytes(val[1].v.str, &length); size = val[2].v.num; - if (font && length != strlen(font)) + if ((font) && (length != strlen(font))) return JS_FALSE; } Index: BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-string-params.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-string-params.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-string-params.c (working copy) @@ -128,7 +128,7 @@ GET_PRIVATE(cx, val[0].v.obj, know); str = elixir_get_string_bytes(val[1].v.str, NULL); - if (str && strncmp(str, "elixir_jsval", 12) == 0) + if ((str) && (strncmp(str, "elixir_jsval", 12) == 0)) { JS_SET_RVAL(cx, vp, JSVAL_NULL); return JS_TRUE; @@ -151,7 +151,7 @@ GET_PRIVATE(cx, val[0].v.obj, know); str = elixir_get_string_bytes(val[1].v.str, NULL); - if (str && strncmp(str, "elixir_jsval", 12) == 0) + if ((str) && (strncmp(str, "elixir_jsval", 12) == 0)) { JS_SET_RVAL(cx, vp, JSVAL_NULL); return JS_TRUE; Index: BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-image-binding.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-image-binding.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-image-binding.c (working copy) @@ -77,7 +77,7 @@ file = elixir_file_canonicalize(elixir_get_string_bytes(val[1].v.str, NULL)); key = elixir_get_string_bytes(val[2].v.str, &length); - if (key && strlen(key) != length) + if ((key) && (strlen(key) != length)) return JS_FALSE; } Index: BINDINGS/javascript/elixir/src/modules/bindings/sqlite/sqlite_module.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/sqlite/sqlite_module.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/sqlite/sqlite_module.c (working copy) @@ -317,7 +317,7 @@ return JS_FALSE; tmp = elixir_get_string_bytes(val[0].v.str, &length); - if (tmp && length != strlen(tmp)) + if ((tmp) && (length != strlen(tmp))) return JS_FALSE; filename = elixir_file_canonicalize(tmp); @@ -347,7 +347,7 @@ return JS_FALSE; tmp = elixir_get_string_bytes(val[0].v.str, &length); - if (tmp && length != strlen(tmp)) + if ((tmp) && (length != strlen(tmp))) return JS_FALSE; filename = elixir_file_canonicalize(tmp); flags = val[1].v.num; @@ -713,7 +713,7 @@ { parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return ; elixir_function_start(cx); @@ -759,7 +759,7 @@ { parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return -1; elixir_function_start(cx); @@ -809,7 +809,7 @@ { parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return -1; elixir_function_start(cx); @@ -867,7 +867,7 @@ { parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) goto on_error; elixir_function_start(cx); @@ -1023,7 +1023,7 @@ { parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return ; elixir_function_start(cx); @@ -1097,7 +1097,7 @@ { parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return ; elixir_function_start(cx); @@ -1137,10 +1137,10 @@ final = val[6].v.fct; } - if (!elixir_params_check(cx, _sqlite3_create_function_reset, val, argc, JS_ARGV(cx, vp)) - && !func - && !step - && !final) + if ((!elixir_params_check(cx, _sqlite3_create_function_reset, val, argc, JS_ARGV(cx, vp))) + && (!func) + && (!step) + && (!final)) return JS_FALSE; GET_PRIVATE(cx, val[0].v.obj, db); @@ -1180,7 +1180,7 @@ { parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return 1; argv[0] = elixir_void_get_jsval(cdata); @@ -1233,7 +1233,7 @@ parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return ; elixir_function_start(cx); @@ -1305,7 +1305,7 @@ parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return ; elixir_function_start(cx); @@ -1359,7 +1359,7 @@ parent = elixir_void_get_parent(cdata); cx = elixir_void_get_cx(cdata); - if (!parent || !cx) + if ((!parent) || (!cx)) return SQLITE_OK; elixir_function_start(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_layout_module.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_layout_module.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_layout_module.c (working copy) @@ -46,7 +46,7 @@ cx = elixir_void_get_cx(user_data); parent = elixir_void_get_parent(user_data); - if (!cx || !parent || !cb || !cb[0] || !priv) return ; + if ((!cx) || (!parent) || (!cb) || (!cb[0]) || (!priv)) return ; elixir_function_start(cx); @@ -135,7 +135,7 @@ cb = elixir_void_get_private(data); argv[0] = elixir_void_get_jsval(data); - if (!cb || !cb[1]) + if ((!cb) || (!cb[1])) return NULL; elixir_function_start(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c (working copy) @@ -1931,7 +1931,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return NULL; elixir_function_start(cx); @@ -2024,7 +2024,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return ; elixir_function_start(cx); @@ -2129,7 +2129,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return ; elixir_function_start(cx); @@ -2193,7 +2193,7 @@ cb = elixir_void_get_private(data); cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return ; elixir_function_start(cx); @@ -2590,7 +2590,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return ; elixir_function_start(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/ecore_evas/ecore_evas_module.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/ecore_evas/ecore_evas_module.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/ecore_evas/ecore_evas_module.c (working copy) @@ -605,7 +605,7 @@ GET_PRIVATE(cx, val[0].v.obj, ee); key = elixir_get_string_bytes(val[1].v.str, NULL); - if (key && strncmp(key, "_elixir_", 8) == 0) + if ((key) && (strncmp(key, "_elixir_", 8) == 0)) { JS_SET_RVAL(cx, vp, JSVAL_NULL); return JS_TRUE; @@ -649,7 +649,7 @@ GET_PRIVATE(cx, val[0].v.obj, ee); key = elixir_get_string_bytes(val[1].v.str, NULL); - if (key && strncmp(key, "_elixir_", 8) == 0) + if ((key) && (strncmp(key, "_elixir_", 8) == 0)) return JS_FALSE; data = elixir_void_new(cx, JS_THIS_OBJECT(cx, vp), val[2].v.any, NULL); @@ -798,7 +798,7 @@ cx = elixir_void_get_cx(data); parent = elixir_void_get_parent(data); - if (!cx || !parent || !cb) + if ((!cx) || (!parent) || (!cb)) return ; suspended = elixir_function_suspended(cx); Index: BINDINGS/javascript/elixir/src/modules/bindings/dir/dir_module.c =================================================================== --- BINDINGS/javascript/elixir/src/modules/bindings/dir/dir_module.c (revision 51690) +++ BINDINGS/javascript/elixir/src/modules/bindings/dir/dir_module.c (working copy) @@ -98,14 +98,14 @@ if (f1->is_directory != f2->is_directory) return f2->is_directory - f1->is_directory; - if (f1->filename[f1->filename_length - 3] == '/' - && f1->filename[f1->filename_length - 2] == '.' - && f1->filename[f1->filename_length - 1] == '.') + if ((f1->filename[f1->filename_length - 3] == '/') + && (f1->filename[f1->filename_length - 2] == '.') + && (f1->filename[f1->filename_length - 1] == '.')) return 1; - if (f2->filename[f2->filename_length - 3] == '/' - && f2->filename[f2->filename_length - 2] == '.' - && f2->filename[f2->filename_length - 1] == '.') + if ((f2->filename[f2->filename_length - 3] == '/') + && (f2->filename[f2->filename_length - 2] == '.') + && (f2->filename[f2->filename_length - 1] == '.')) return -1; return strcmp(f1->lower_filename, f2->lower_filename); @@ -173,12 +173,12 @@ int name_length; /* Don't list hidden file. */ - if (dent->d_name[0] == '.' && dent->d_name[1] != '.') + if ((dent->d_name[0] == '.') && (dent->d_name[1] != '.')) continue ; /* No escape from files_root. */ if (strcmp(dent->d_name, "..") == 0) - if (keep_back || strcmp(filename, elixir_file_virtual_chroot_get()) == 0) + if ((keep_back) || (strcmp(filename, elixir_file_virtual_chroot_get()) == 0)) continue ; name_length = strlen(dent->d_name); @@ -357,8 +357,8 @@ } cached_dir = elixir_context_find("cached_directory"); - if (cached_dir - && strcmp(cached_dir->name, safe_file) == 0) + if ((cached_dir) + && (strcmp(cached_dir->name, safe_file) == 0)) { struct elixir_path_s *it; int cached_count = 0; @@ -369,9 +369,9 @@ { if (strcmp(paths->name, it->name) == 0) { - if (it->dev != paths->dev - || it->ino != paths->ino - || it->mtime != paths->mtime) + if ((it->dev != paths->dev) + || (it->ino != paths->ino) + || (it->mtime != paths->mtime)) break; cached_count++; @@ -493,7 +493,7 @@ directory = eina_list_nth_list(directory, offset); - for (index = 0; directory && (length == -1 || index < length); ++index, directory = eina_list_next(directory)) + for (index = 0; (directory) && ((length == -1) || (index < length)); ++index, directory = eina_list_next(directory)) { struct elixir_file_dir_s *current; struct elixir_file_s *new; @@ -550,7 +550,7 @@ real = elixir_get_string_bytes(val[0].v.str, NULL); virtual = elixir_get_string_bytes(val[1].v.str, NULL); - if (!real || !virtual) + if ((!real) || (!virtual)) return JS_FALSE; new = malloc(sizeof(struct elixir_virtual_dir_s)); @@ -649,7 +649,7 @@ elixir_object_unregister(cx, (JSObject**) &esmd->parent); cached_dir = elixir_context_find("cached_directory"); - if (cached_dir && cached_dir->references > 0) + if ((cached_dir) && (cached_dir->references > 0)) cached_dir->references = 1; free(esmd); Index: TMP/st/elementary/src/lib/elm_entry.c =================================================================== --- TMP/st/elementary/src/lib/elm_entry.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_entry.c (working copy) @@ -315,7 +315,7 @@ Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; Evas_Coord resw, resh; if (!wd) return; - if (wd->linewrap || wd->char_linewrap) + if ((wd->linewrap) || (wd->char_linewrap)) { evas_object_geometry_get(wd->ent, NULL, NULL, &resw, &resh); if ((resw == wd->lastw) && (!wd->changed)) return; @@ -403,7 +403,7 @@ { Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; - if (wd->linewrap || wd->char_linewrap) + if ((wd->linewrap) || (wd->char_linewrap)) { _sizing_eval(data); } Index: TMP/st/elementary/src/lib/elm_theme.c =================================================================== --- TMP/st/elementary/src/lib/elm_theme.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_theme.c (working copy) @@ -62,7 +62,7 @@ if ((f[0] == '/') || ((f[0] == '.') && (f[1] == '/')) || ((f[0] == '.') && (f[1] == '.') && (f[2] == '/')) || - (isalpha(f[0]) && f[1] == ':')) + ((isalpha(f[0])) && (f[1] == ':'))) return _elm_theme_find_try(th, f, group); else if (((f[0] == '~') && (f[1] == '/'))) { Index: TMP/st/elementary/src/lib/elm_genlist.c =================================================================== --- TMP/st/elementary/src/lib/elm_genlist.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_genlist.c (working copy) @@ -879,7 +879,7 @@ edje_object_signal_emit(it->base, "elm,state,expanded", "elm"); } - if (calc && it->wd->homogeneous && it->wd->item_width) + if ((calc) && (it->wd->homogeneous) && (it->wd->item_width)) { /* homogenous genlist shortcut */ if (!it->mincalcd) @@ -957,7 +957,7 @@ it->h = it->minh = mh; it->mincalcd = EINA_TRUE; - if (in == 0 && it->wd->homogeneous) + if ((in == 0) && (it->wd->homogeneous)) { it->wd->item_width = mw; it->wd->item_height = mh; Index: TMP/st/elementary/src/lib/elm_list.c =================================================================== --- TMP/st/elementary/src/lib/elm_list.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_list.c (working copy) @@ -1340,7 +1340,7 @@ { ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); if (it->icon == icon) return; - if (it->dummy_icon && !icon) return; + if ((it->dummy_icon) && (!icon)) return; if (it->dummy_icon) { evas_object_del(it->icon); @@ -1395,7 +1395,7 @@ { ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); if (it->end == end) return; - if (it->dummy_end && !end) return; + if ((it->dummy_end) && (!end)) return; if (it->dummy_end) { evas_object_del(it->end); Index: TMP/st/elementary/src/lib/elm_gengrid.c =================================================================== --- TMP/st/elementary/src/lib/elm_gengrid.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_gengrid.c (working copy) @@ -393,7 +393,7 @@ { if (item->want_unrealize) _item_unrealize(item); } - if ((item->disabled) || dragged) return; + if ((item->disabled) || (dragged)) return; if (item->wd->multi) { if (!item->selected) Index: TMP/st/elementary/src/lib/els_scroller.c =================================================================== --- TMP/st/elementary/src/lib/els_scroller.c (revision 51690) +++ TMP/st/elementary/src/lib/els_scroller.c (working copy) @@ -1260,12 +1260,12 @@ sd = data; ev = event_info; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; - if (evas_key_modifier_is_set(ev->modifiers, "Control") || - evas_key_modifier_is_set(ev->modifiers, "Alt") || - evas_key_modifier_is_set(ev->modifiers, "Shift") || - evas_key_modifier_is_set(ev->modifiers, "Meta") || - evas_key_modifier_is_set(ev->modifiers, "Hyper") || - evas_key_modifier_is_set(ev->modifiers, "Super")) + if ((evas_key_modifier_is_set(ev->modifiers, "Control")) || + (evas_key_modifier_is_set(ev->modifiers, "Alt")) || + (evas_key_modifier_is_set(ev->modifiers, "Shift")) || + (evas_key_modifier_is_set(ev->modifiers, "Meta")) || + (evas_key_modifier_is_set(ev->modifiers, "Hyper")) || + (evas_key_modifier_is_set(ev->modifiers, "Super"))) return; elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y); if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator) || Index: TMP/st/elementary/src/lib/elm_radio.c =================================================================== --- TMP/st/elementary/src/lib/elm_radio.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_radio.c (working copy) @@ -186,7 +186,7 @@ } else _state_set(child, 0); } - if (disabled && selected) _state_set(selected, 1); + if ((disabled) && (selected)) _state_set(selected, 1); } static void Index: TMP/st/elementary/src/lib/elm_calendar.c =================================================================== --- TMP/st/elementary/src/lib/elm_calendar.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_calendar.c (working copy) @@ -98,7 +98,7 @@ month = time->tm_mon; year = time->tm_year + 1900; - return _days_in_month[(!(year % 4) && (!(year % 400) || (year % 100)))] + return _days_in_month[((!(year % 4)) && ((!(year % 400)) || (year % 100)))] [month]; } @@ -215,7 +215,7 @@ wd->selected_it = i; } - if (day && (day <= maxdays)) + if ((day) && (day <= maxdays)) snprintf(day_s, sizeof(day_s), "%d", day++); else day_s[0] = 0; Index: TMP/st/elementary/src/lib/elm_button.c =================================================================== --- TMP/st/elementary/src/lib/elm_button.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_button.c (working copy) @@ -193,7 +193,7 @@ Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; - if (wd->autorepeat && !wd->repeating) + if ((wd->autorepeat) && (!wd->repeating)) { if (wd->ar_threshold <= 0.0) _autorepeat_initial_send(data); /* call immediately */ @@ -408,5 +408,5 @@ if (wd->ar_interval == t) return; wd->ar_interval = t; - if (wd->repeating && wd->timer) ecore_timer_interval_set(wd->timer, t); + if ((wd->repeating) && (wd->timer)) ecore_timer_interval_set(wd->timer, t); } Index: TMP/st/elementary/src/lib/elm_map.c =================================================================== --- TMP/st/elementary/src/lib/elm_map.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_map.c (working copy) @@ -322,7 +322,7 @@ gw = wd->size.w; gh = wd->size.h; - if (ww == gw && hh == gh) return; + if ((ww == gw) && (hh == gh)) return; if (ow > gw) ax = (ow - gw) / 2; if (oh > gh) ay = (oh - gh) / 2; @@ -373,8 +373,8 @@ } wd->marker_zoom = wd->zoom; - if (wd->paused_markers - && (wd->size.nw != wd->size.w || wd->size.nh != wd->size.h) ) + if ((wd->paused_markers) + && ((wd->size.nw != wd->size.w) || (wd->size.nh != wd->size.h)) ) return; g_xx = wd->pan_x / wd->tsize; @@ -390,7 +390,7 @@ EINA_LIST_FREE(wd->cells_displayed, cell) { eina_matrixsparse_cell_position_get(cell, (unsigned long *)&y, (unsigned long *)&x); - if (y < g_yy || y > g_yy + g_hh || x < g_xx || x > g_xx + g_ww) + if ((y < g_yy) || (y > g_yy + g_hh) || (x < g_xx) || (x > g_xx + g_ww)) { EINA_LIST_FOREACH(eina_matrixsparse_cell_data_get(cell), l, group) { @@ -441,9 +441,9 @@ hh = (((long long)gh * (ty + hh)) / g->h) - yy; } - if (!group->clas->hide - && xx-px+ax+ox >= ox && xx-px+ax+ox<= ox+ow - && yy-py+ay+oy >= oy && yy-py+ay+oy<= oy+oh) + if ((!group->clas->hide) + && (xx-px+ax+ox >= ox) && (xx-px+ax+ox<= ox+ow) + && (yy-py+ay+oy >= oy) && (yy-py+ay+oy<= oy+oh)) { if (!group->obj) _group_object_create(group); @@ -461,7 +461,7 @@ evas_object_move(group->obj, xx - px + ax + ox - ww/2, yy - py + ay + oy - hh/2); - if (!wd->paused_markers || group->update_resize) + if ((!wd->paused_markers) || (group->update_resize)) { group->update_resize = EINA_FALSE; evas_object_resize(group->obj, ww, hh); @@ -624,7 +624,7 @@ gi->job = NULL; DBG("DOWNLOAD done %s", gi->file); - if (gi->want && !status) _tile_update(gi); + if ((gi->want) && (!status)) _tile_update(gi); if (status) { @@ -809,7 +809,7 @@ eina_matrixsparse_data_idx_set(g->grid, y, x, gi); } - if (!gi->have && !gi->download) + if ((!gi->have) && (!gi->download)) { char buf[PATH_MAX], buf2[PATH_MAX]; char *source; @@ -826,7 +826,7 @@ eina_stringshare_replace(&gi->file, buf2); - if (ecore_file_exists(buf2) || g == eina_list_data_get(wd->grids)) + if ((ecore_file_exists(buf2)) || (g == eina_list_data_get(wd->grids))) { gi->download = EINA_TRUE; wd->preload_num++; @@ -1364,7 +1364,7 @@ Evas_Object *icon = NULL; if (group->obj) return; - if (!group->clas->priv.objs_notused || eina_list_count(group->markers) == 1) + if ((!group->clas->priv.objs_notused) || (eina_list_count(group->markers) == 1)) { //set icon and style if (eina_list_count(group->markers) == 1) @@ -1525,7 +1525,7 @@ EINA_LIST_FOREACH(group->markers, l, marker) { if (i >= group->wd->markers_max_num) break; - if (!marker->content && marker->clas->func.get) + if ((!marker->content) && (marker->clas->func.get)) marker->content = marker->clas->func.get(group->wd->obj, marker, marker->data); else if (marker->content) elm_box_unpack(group->bx, marker->content); @@ -1547,7 +1547,7 @@ if (!group->sc) return; EINA_LIST_FOREACH(group->markers, l, marker) { - if (marker->content && marker->clas->func.del) + if ((marker->content) && (marker->clas->func.del)) marker->clas->func.del(group->wd->obj, marker, marker->data, marker->content); else if (marker->content) evas_object_del(marker->content); @@ -1577,7 +1577,7 @@ Evas_Coord xx, yy, ww, hh; const char *s; - if (!group->bubble || !group->obj) return; + if ((!group->bubble) || (!group->obj)) return; evas_object_geometry_get(group->obj, &x, &y, &w, NULL); edje_object_size_min_calc(group->bubble, NULL, &hh); @@ -2496,14 +2496,14 @@ if (marker->groups[i]->h > marker->groups[i]->clas->priv.edje_max_h) marker->groups[i]->h = marker->groups[i]->clas->priv.edje_max_h; } - if (marker->groups[i]->obj && eina_list_count(marker->groups[i]->markers) == 1) + if ((marker->groups[i]->obj) && (eina_list_count(marker->groups[i]->markers) == 1)) { _group_object_free(marker->groups[i]); _group_object_create(marker->groups[i]); } } - if (marker->content && marker->clas->func.del) + if ((marker->content) && (marker->clas->func.del)) marker->clas->func.del(marker->wd->obj, marker, marker->data, marker->content); else if (marker->content) evas_object_del(marker->content); @@ -2574,16 +2574,16 @@ { wd = marker->wd; - if (!m_min_lon || marker->longitude < m_min_lon->longitude) + if ((!m_min_lon) || (marker->longitude < m_min_lon->longitude)) m_min_lon = marker; - if (!m_max_lon || marker->longitude > m_max_lon->longitude) + if ((!m_max_lon) || (marker->longitude > m_max_lon->longitude)) m_max_lon = marker; - if (!m_min_lat || marker->latitude > m_min_lat->latitude) + if ((!m_min_lat) || (marker->latitude > m_min_lat->latitude)) m_min_lat = marker; - if (!m_max_lat || marker->latitude < m_max_lat->latitude) + if ((!m_max_lat) || (marker->latitude < m_max_lat->latitude)) m_max_lat = marker; } @@ -2596,10 +2596,10 @@ Evas_Coord size = pow(2.0, zoom)*wd->tsize; elm_map_utils_convert_geo_into_coord(lon, lat, size, &xc, &yc); - if (m_min_lon->x[zoom] - wd->marker_max_w >= xc-rw/2 - && m_min_lat->y[zoom] - wd->marker_max_h >= yc-rh/2 - && m_max_lon->x[zoom] + wd->marker_max_w <= xc+rw/2 - && m_max_lat->y[zoom] + wd->marker_max_h <= yc+rh/2) + if ((m_min_lon->x[zoom] - wd->marker_max_w >= xc-rw/2) + && (m_min_lat->y[zoom] - wd->marker_max_h >= yc-rh/2) + && (m_max_lon->x[zoom] + wd->marker_max_w <= xc+rw/2) + && (m_max_lat->y[zoom] + wd->marker_max_h <= yc+rh/2)) break; } @@ -2975,7 +2975,7 @@ EAPI void elm_map_source_custom_api_set(Elm_Map_Sources source, const char *name, int zoom_min, int zoom_max, ElmMapSourceURLFunc url_cb) { - if (!name || !url_cb) return; + if ((!name) || (!url_cb)) return; map_sources_tab[source].name = name; map_sources_tab[source].zoom_min = zoom_min; map_sources_tab[source].zoom_max = zoom_max; Index: TMP/st/elementary/src/lib/elm_label.c =================================================================== --- TMP/st/elementary/src/lib/elm_label.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_label.c (working copy) @@ -115,7 +115,7 @@ maxh = minh; evas_object_size_hint_max_set(obj, maxw, maxh); - if (wd->ellipsis && _is_width_over(obj) == 1) + if ((wd->ellipsis) && (_is_width_over(obj) == 1)) _ellipsis_label_to_width(obj); } } @@ -222,7 +222,7 @@ break; } while (strlen(srcstring) > 1); - if (starttag && endtag && tagtxtlen > strlen(key)) + if ((starttag) && (endtag) && (tagtxtlen > strlen(key))) { repbuf = eina_strbuf_new(); diffbuf = eina_strbuf_new(); @@ -318,9 +318,9 @@ evas_object_geometry_get (obj, &vx,&vy,&vw,&vh); - if (x >= 0 && y >= 0) return 0; + if ((x >= 0) && (y >= 0)) return 0; - if (ellen < wd->wrap_w && w > wd->wrap_w) return 1; + if ((ellen < wd->wrap_w) && (w > wd->wrap_w)) return 1; return 0; } @@ -346,7 +346,7 @@ deffont = edje_object_data_get(wd->lbl, "default_font_size"); if (deffont) cur_fontsize = atoi(deffont); else cur_fontsize = 1; - if (minfontsize == maxfontsize || cur_fontsize == 1) return; // theme is not ready for ellipsis + if ((minfontsize == maxfontsize) || (cur_fontsize == 1)) return; // theme is not ready for ellipsis if (eina_stringshare_strlen(wd->label) <= 0) return; if (_get_value_in_key_string(wd->label, "font_size", &kvalue) == 0) Index: TMP/st/elementary/src/lib/elm_thumb.c =================================================================== --- TMP/st/elementary/src/lib/elm_thumb.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_thumb.c (working copy) @@ -503,7 +503,7 @@ eina_stringshare_replace(&(wd->thumb.key), NULL); #ifdef HAVE_ELEMENTARY_ETHUMB - if ((file_replaced || key_replaced) && evas_object_visible_get(obj)) + if (((file_replaced) || (key_replaced)) && (evas_object_visible_get(obj))) _thumb_show(wd); #endif } @@ -576,8 +576,8 @@ ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (setting < ELM_THUMB_ANIMATION_START || - setting >= ELM_THUMB_ANIMATION_LAST) + if ((setting < ELM_THUMB_ANIMATION_START) || + (setting >= ELM_THUMB_ANIMATION_LAST)) { return; } Index: TMP/st/elementary/src/lib/elm_cnp_helper.c =================================================================== --- TMP/st/elementary/src/lib/elm_cnp_helper.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_cnp_helper.c (working copy) @@ -260,7 +260,7 @@ if ((unsigned int)selection >= (unsigned int)ELM_SEL_MAX) return EINA_FALSE; if (!_elm_cnp_init_count) _elm_cnp_init(); - if (!selbuf && format != ELM_SEL_IMAGE) + if ((!selbuf) && (format != ELM_SEL_IMAGE)) return elm_selection_clear(selection, widget); sel = selections + selection; @@ -290,7 +290,7 @@ sel = selections + selection; /* No longer this selection: Consider it gone! */ - if (!sel->active || sel->widget != widget) return EINA_TRUE; + if ((!sel->active) || (sel->widget != widget)) return EINA_TRUE; sel->active = 0; sel->widget = NULL; @@ -553,7 +553,7 @@ if (!(atoms[j].formats & sel->requestformat)) continue; for (i = 0 ; i < targets->data.length ; i ++) { - if (atoms[j].atom == atomlist[i] && atoms[j].response){ + if ((atoms[j].atom == atomlist[i]) && (atoms[j].response)){ /* Found a match: Use it */ goto found; } @@ -761,13 +761,13 @@ while (*p) { - if (*p != '<' && *p != '&'){ + if ((*p != '<') && (*p != '&')){ *q ++ = *p ++; } else if (*p == '<') { - if (p[1] == 'b' && p[2] == 'r' && - (p[3] == ' ' || p[3] == '/' || p[3] == '>')) + if ((p[1] == 'b') && (p[2] == 'r') && + ((p[3] == ' ') || (p[3] == '/') || (p[3] == '>'))) *q++ = '\n'; - while (*p && *p != '>') p ++; + while ((*p) && (*p != '>')) p ++; p ++; } else if (*p == '&') { p ++; Index: TMP/st/elementary/src/lib/elm_pager.c =================================================================== --- TMP/st/elementary/src/lib/elm_pager.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_pager.c (working copy) @@ -126,7 +126,7 @@ wd->top = ittop; o = wd->top->base; evas_object_show(o); - if (wd->oldtop && wd->oldtop->popme) + if ((wd->oldtop) && (wd->oldtop->popme)) edje_object_signal_emit(o, "elm,action,show", "elm"); else edje_object_signal_emit(o, "elm,action,push", "elm"); Index: TMP/st/elementary/src/lib/elm_slideshow.c =================================================================== --- TMP/st/elementary/src/lib/elm_slideshow.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_slideshow.c (working copy) @@ -101,7 +101,7 @@ { Widget_Data *wd = elm_widget_data_get(item->obj); Elm_Slideshow_Item* prev = eina_list_data_get(eina_list_prev(item->l)); - if(!prev && wd->loop) + if((!prev) && (wd->loop)) prev = eina_list_data_get(eina_list_last(item->l)); return prev; } @@ -109,7 +109,7 @@ { Widget_Data *wd = elm_widget_data_get(item->obj); Elm_Slideshow_Item* next = eina_list_data_get(eina_list_next(item->l)); - if(!next && wd->loop) + if((!next) && (wd->loop)) next = eina_list_data_get(wd->items); return next; } @@ -200,7 +200,7 @@ item = wd->current; - if (!item || !item->o) return; + if ((!item) || (!item->o)) return; _item_realize(item); edje_object_part_unswallow(NULL, item->o); @@ -365,7 +365,7 @@ if (wd->current) next = _item_next_get(wd->current); - if (!next || next == wd->current) return; + if ((!next) || (next == wd->current)) return; _end(obj, obj, NULL, NULL); @@ -406,7 +406,7 @@ if (wd->current) prev = _item_prev_get(wd->current); - if (!prev || prev == wd->current) return; + if ((!prev) || (prev == wd->current)) return; _end(obj, obj, NULL, NULL); @@ -663,7 +663,7 @@ wd->items = eina_list_remove_list(wd->items, item->l); wd->items_built = eina_list_remove_list(wd->items_built, item->l_built); - if (item->o && item->itc->func.del) + if ((item->o) && (item->itc->func.del)) item->itc->func.del((void*)item->data, wd->previous->o); if (item->o) evas_object_del(item->o); Index: TMP/st/elementary/src/lib/elm_progressbar.c =================================================================== --- TMP/st/elementary/src/lib/elm_progressbar.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_progressbar.c (working copy) @@ -89,7 +89,7 @@ edje_object_signal_emit(wd->progressbar, "elm,state,pulse", "elm"); else edje_object_signal_emit(wd->progressbar, "elm,state,fraction", "elm"); - if (wd->units && !wd->pulse) + if ((wd->units) && (!wd->pulse)) edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm"); else edje_object_signal_emit(wd->progressbar, "elm,state,units,hidden", "elm"); @@ -276,7 +276,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; state = !!state; - if (!wd->pulse && wd->pulse_state == state) return; + if ((!wd->pulse) && (wd->pulse_state == state)) return; wd->pulse_state = state; if (wd->pulse_state) edje_object_signal_emit(wd->progressbar, "elm,state,pulse,start", "elm"); Index: TMP/st/elementary/src/lib/elm_clock.c =================================================================== --- TMP/st/elementary/src/lib/elm_clock.c (revision 51690) +++ TMP/st/elementary/src/lib/elm_clock.c (working copy) @@ -342,7 +342,7 @@ _elm_theme_object_set(obj, wd->digit[i], "clock", "flipdigit", style); edje_object_scale_set(wd->digit[i], elm_widget_scale_get(obj) * _elm_config->scale); - if (wd->edit && (wd->digedit & (1 << i))) + if ((wd->edit) && (wd->digedit & (1 << i))) edje_object_signal_emit(wd->digit[i], "elm,state,edit,on", "elm"); edje_object_signal_callback_add(wd->digit[i], "elm,action,up,start", "", _signal_clock_val_up_start, obj); @@ -610,7 +610,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; wd->edit = edit; - if (edit && (wd->digedit == ELM_CLOCK_NONE)) + if ((edit) && (wd->digedit == ELM_CLOCK_NONE)) elm_clock_digit_edit_set(obj, ELM_CLOCK_ALL); else _time_update(obj); Index: TMP/st/elementary/src/bin/test_photocam.c =================================================================== --- TMP/st/elementary/src/bin/test_photocam.c (revision 51690) +++ TMP/st/elementary/src/bin/test_photocam.c (working copy) @@ -214,7 +214,7 @@ ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; zoom = elm_photocam_zoom_get(photocam); - if (ev->z>0 && zoom == 1) return; + if ((ev->z>0) && (zoom == 1)) return; if (ev->z > 0) zoom /= 2; Index: TMP/st/elementary/src/bin/test_map.c =================================================================== --- TMP/st/elementary/src/bin/test_map.c (revision 51690) +++ TMP/st/elementary/src/bin/test_map.c (working copy) @@ -350,7 +350,7 @@ zoom++; elm_map_zoom_mode_set(map, ELM_MAP_ZOOM_MODE_MANUAL); - if (zoom >= 0 && zoom <= 18) elm_map_zoom_set(map, zoom); + if ((zoom >= 0) && (zoom <= 18)) elm_map_zoom_set(map, zoom); } static void Index: TMP/st/elementary/src/bin/test_photo.c =================================================================== --- TMP/st/elementary/src/bin/test_photo.c (revision 51690) +++ TMP/st/elementary/src/bin/test_photo.c (working copy) @@ -47,7 +47,7 @@ evas_object_size_hint_align_set(ph, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_photo_size_set(ph, 80); - if(n == 2 || n == 3) { + if((n == 2) || (n == 3)) { elm_photo_fill_inside_set(ph, EINA_TRUE); elm_widget_style_set(ph, "shadow"); } Index: TMP/st/elementary/src/edje_externals/elm_panes.c =================================================================== --- TMP/st/elementary/src/edje_externals/elm_panes.c (revision 51690) +++ TMP/st/elementary/src/edje_externals/elm_panes.c (working copy) @@ -40,8 +40,8 @@ static Eina_Bool external_panes_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param) { - if (!strcmp(param->name, "content left") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + if ((!strcmp(param->name, "content left")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)) { Evas_Object *content = external_common_param_edje_object_get(obj, param); if ((strcmp(param->s, "")) && (!content)) @@ -49,8 +49,8 @@ elm_panes_content_left_set(obj, content); return EINA_TRUE; } - else if (!strcmp(param->name, "content right") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + else if ((!strcmp(param->name, "content right")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)) { Evas_Object *content = external_common_param_edje_object_get(obj, param); if ((strcmp(param->s, "")) && (!content)) @@ -58,14 +58,14 @@ elm_panes_content_right_set(obj, content); return EINA_TRUE; } - else if (!strcmp(param->name, "horizontal") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + else if ((!strcmp(param->name, "horizontal")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)) { elm_panes_horizontal_set(obj, param->i); return EINA_TRUE; } - else if (!strcmp(param->name, "left size") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + else if ((!strcmp(param->name, "left size")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)) { elm_panes_content_left_size_set(obj, param->d); return EINA_TRUE; @@ -90,14 +90,14 @@ /* not easy to get content name back from live object */ return EINA_FALSE; } - else if (!strcmp(param->name, "horizontal") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + else if ((!strcmp(param->name, "horizontal")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)) { param->i = elm_panes_horizontal_is(obj); return EINA_TRUE; } - else if (!strcmp(param->name, "left size") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + else if ((!strcmp(param->name, "left size")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)) { param->d = elm_panes_content_left_size_get(obj); return EINA_TRUE; Index: TMP/st/elementary/src/edje_externals/elm_notify.c =================================================================== --- TMP/st/elementary/src/edje_externals/elm_notify.c (revision 51690) +++ TMP/st/elementary/src/edje_externals/elm_notify.c (working copy) @@ -74,8 +74,8 @@ static Eina_Bool external_notify_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param) { - if (!strcmp(param->name, "content") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + if ((!strcmp(param->name, "content")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)) { Evas_Object *content = external_common_param_edje_object_get(obj, param); if ((strcmp(param->s, "")) && (!content)) @@ -83,26 +83,26 @@ elm_notify_content_set(obj, content); return EINA_TRUE; } - else if (!strcmp(param->name, "repeat_events") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + else if ((!strcmp(param->name, "repeat_events")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)) { elm_notify_repeat_events_set(obj, param->i); return EINA_TRUE; } - else if (!strcmp(param->name, "timer_init") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + else if ((!strcmp(param->name, "timer_init")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)) { elm_notify_timer_init(obj); return EINA_TRUE; } - else if (!strcmp(param->name, "timeout") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + else if ((!strcmp(param->name, "timeout")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)) { elm_notify_timeout_set(obj, param->i); return EINA_TRUE; } - else if (!strcmp(param->name, "orient") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + else if ((!strcmp(param->name, "orient")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)) { Elm_Notify_Orient set = _orient_get(param->s); if (set == ELM_NOTIFY_ORIENT_LAST) return; @@ -124,20 +124,20 @@ /* not easy to get content name back from live object */ return EINA_FALSE; } - else if (!strcmp(param->name, "repeat_events") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + else if ((!strcmp(param->name, "repeat_events")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)) { param->i = elm_notify_repeat_events_get(obj); return EINA_TRUE; } - else if (!strcmp(param->name, "timeout") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + else if ((!strcmp(param->name, "timeout")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)) { param->i = elm_notify_timeout_get(obj); return EINA_TRUE; } - else if (!strcmp(param->name, "orient") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + else if ((!strcmp(param->name, "orient")) + && (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)) { Elm_Notify_Orient set = elm_notify_orient_get(obj); if (set == ELM_NOTIFY_ORIENT_LAST) return EINA_FALSE; @@ -170,7 +170,7 @@ mem->timeout = param->i; mem->timeout_exists = EINA_TRUE; } - else if (!strcmp(param->name, "timer_init") && param->i > 0) + else if ((!strcmp(param->name, "timer_init")) && (param->i > 0)) { mem->timer_init = EINA_TRUE; } Index: TMP/st/elementary/src/edje_externals/elm_fileselector.c =================================================================== --- TMP/st/elementary/src/edje_externals/elm_fileselector.c (revision 51690) +++ TMP/st/elementary/src/edje_externals/elm_fileselector.c (working copy) @@ -23,7 +23,7 @@ else if (from_params) p = from_params; else return; - if (p->is_save_set && p->is_save) + if ((p->is_save_set) && (p->is_save)) elm_fileselector_is_save_set(obj, p->is_save); if (p->folder_only_set) elm_fileselector_folder_only_set(obj, p->folder_only); Index: ensure/src/ensure.c =================================================================== --- ensure/src/ensure.c (revision 51690) +++ ensure/src/ensure.c (working copy) @@ -408,7 +408,7 @@ enwin = data; - if (enwin->name && strlen(enwin->name) > 1){ + if ((enwin->name) && (strlen(enwin->name) > 1)){ return strdup(enwin->name); } @@ -653,7 +653,7 @@ assert((int)enasn->severity >= 0); assert(enasn->severity < ENSURE_N_SEVERITIES); - if ((int)enasn->severity < 0 && enasn->severity >= ENSURE_N_SEVERITIES){ + if (((int)enasn->severity < 0) && (enasn->severity >= ENSURE_N_SEVERITIES)){ return -1; } @@ -678,7 +678,7 @@ for (i = 0 ; i < ENSURE_N_SEVERITIES ; i ++){ EINA_LIST_FOREACH(severity[i].asninfo, l, ai){ - if (ai->enabled && ai->asn->object) + if ((ai->enabled) && (ai->asn->object)) ai->asn->object(ensure, enobj, ai->data); } } @@ -695,7 +695,7 @@ for (i = 0 ; i < ENSURE_N_SEVERITIES ; i ++){ EINA_LIST_FOREACH(severity[i].asninfo, l, ai){ - if (ai->enabled && ai->asn->init) + if ((ai->enabled) && (ai->asn->init)) ai->data = ai->asn->init(ensure); } } @@ -704,7 +704,7 @@ for (i = 0 ; i < ENSURE_N_SEVERITIES ; i ++){ EINA_LIST_FOREACH(severity[i].asninfo, l, ai){ - if (ai->enabled && ai->asn->fini) + if ((ai->enabled) && (ai->asn->fini)) ai->asn->fini(ensure, ai->data); ai->data = NULL; } Index: ensure/src/enasn.c =================================================================== --- ensure/src/enasn.c (revision 51690) +++ ensure/src/enasn.c (working copy) @@ -67,7 +67,7 @@ } else if (!asn->summary){ printf("Need summary in assurance '%s'\n",buf); err ++; - } else if (!asn->object && !asn->init && !asn->fini){ + } else if ((!asn->object) && (!asn->init) && (!asn->fini)){ printf("Need at least one function!\n"); err++; } Index: ensure/src/enedj.c =================================================================== --- ensure/src/enedj.c (revision 51690) +++ ensure/src/enedj.c (working copy) @@ -59,7 +59,7 @@ Eina_List *l; struct enedj *enedj; - if (!edjefile || !index) return NULL; + if ((!edjefile) || (!index)) return NULL; EINA_LIST_FOREACH(edjes, l, enedj){ if (streq(enedj->file, edjefile)){ @@ -84,11 +84,11 @@ const char *ensure_restrict index){ long val; assert(enedj); assert(index); - if (!index || !enedj) return NULL; + if ((!index) || (!enedj)) return NULL; if (*index == 'i'){ index = strchr(index, '/'); - if (!index || !*(index + 1)) return NULL; + if ((!index) || (!*(index + 1))) return NULL; index ++; } @@ -96,8 +96,8 @@ errno = 0; val = strtol(index, NULL, 10); - if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) || - (errno && val == 0)){ + if (((errno == ERANGE) && (val == LONG_MAX || (val == LONG_MIN))) || + ((errno) && (val == 0))){ return NULL; } Index: ensure/src/assurances/emptytext.c =================================================================== --- ensure/src/assurances/emptytext.c (revision 51690) +++ ensure/src/assurances/emptytext.c (working copy) @@ -27,7 +27,7 @@ if (obj->type != texttype) return 0; - if (!obj->data.text.text || strlen(obj->data.text.text) == 0){ + if ((!obj->data.text.text) || (strlen(obj->data.text.text) == 0)){ ensure_bug(obj, ENSURE_PEDANTIC, "Empty text string,"); return 1; Index: ensure/src/assurances/premul.c =================================================================== --- ensure/src/assurances/premul.c (revision 51690) +++ ensure/src/assurances/premul.c (working copy) @@ -17,7 +17,7 @@ void *data ensure_unused){ assert(obj); - if (obj->a < obj->r || obj->a < obj->g || obj->a < obj->b){ + if ((obj->a < obj->r) || (obj->a < obj->g) || (obj->a < obj->b)){ ensure_bug(obj,ENSURE_BUG, "Alpha (%d) must be <= rgb values (%d,%d,%d)", obj->a, obj->r, obj->g, obj->b); Index: ensure/src/assurances/badclipsmart.c =================================================================== --- ensure/src/assurances/badclipsmart.c (revision 51690) +++ ensure/src/assurances/badclipsmart.c (working copy) @@ -22,7 +22,7 @@ parent = enobj_parent_get(obj); clip = enobj_clip_get(obj); - if (!parent || !clip) return 0; + if ((!parent) || (!clip)) return 0; clipp = enobj_parent_get(clip); Index: ensure/src/assurances/zerosize.c =================================================================== --- ensure/src/assurances/zerosize.c (revision 51690) +++ ensure/src/assurances/zerosize.c (working copy) @@ -15,7 +15,7 @@ void *data ensure_unused){ assert(obj); - if (obj->w && obj->h) return 0; + if ((obj->w) && (obj->h)) return 0; ensure_bug(obj, ENSURE_BADFORM, "Object has zero size"); return 1; Index: ensure/src/assurances/offscreen.c =================================================================== --- ensure/src/assurances/offscreen.c (revision 51690) +++ ensure/src/assurances/offscreen.c (working copy) @@ -17,7 +17,7 @@ assert(en); assert(obj->enwin); - assert(obj->enwin->w && obj->enwin->h); + assert((obj->enwin->w) && (obj->enwin->h)); enwin = obj->enwin; if (obj->x >= enwin->w){ Index: ensure/src/assurances/template.c =================================================================== --- ensure/src/assurances/template.c (revision 51690) +++ ensure/src/assurances/template.c (working copy) @@ -54,7 +54,7 @@ /* Good idea to not test wrong object types */ if (obj->type != texttype) return 0; - if (obj->data.text.text && strstr(obj->data.text.text,"elvis")){ + if ((obj->data.text.text) && (strstr(obj->data.text.text,"elvis"))){ ensure_bug(obj, ENSURE_POLICY, "String contains 'elvis': %s", obj->data.text.text); Index: ensure/src/assurances/clippedsmart.c =================================================================== --- ensure/src/assurances/clippedsmart.c (revision 51690) +++ ensure/src/assurances/clippedsmart.c (working copy) @@ -23,7 +23,7 @@ if (!clip->parent) return 0; - if (!obj->parent || obj->parent != clip->parent){ + if ((!obj->parent) || (obj->parent != clip->parent)){ ensure_bug(obj, assurance.severity, "Objects' clip different parent to object" "Obj: %llx Clip: %llx",obj->parent,clip->parent); Index: ensure/src/assurances/negativesize.c =================================================================== --- ensure/src/assurances/negativesize.c (revision 51690) +++ ensure/src/assurances/negativesize.c (working copy) @@ -15,7 +15,7 @@ void *data ensure_unused){ assert(obj); - if (obj->w < 0 || obj->h < 0){ + if ((obj->w < 0) || (obj->h < 0)){ ensure_bug(obj, ENSURE_BUG, "Object has negative size (%dx%d)", obj->w,obj->h); return 1; Index: ensure/src/parser.c =================================================================== --- ensure/src/parser.c (revision 51690) +++ ensure/src/parser.c (working copy) @@ -156,7 +156,7 @@ printf("Don't handle %10.10s\n",p); p ++; } - while (*p && isspace(*p)) p ++; + while ((*p) && (isspace(*p))) p ++; } assert(eno->id); Index: PROTO/explicit/src/lib/explicit_client.c =================================================================== --- PROTO/explicit/src/lib/explicit_client.c (revision 51690) +++ PROTO/explicit/src/lib/explicit_client.c (working copy) @@ -73,7 +73,7 @@ { Explicit *context = data; - if (context->server || context->conn) + if ((context->server) || (context->conn)) return EINA_FALSE; context->server = ecore_con_server_connect(ECORE_CON_REMOTE_TCP, @@ -182,9 +182,9 @@ context->handler.add = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, _explicit_context_add, context); context->handler.del = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, _explicit_context_del, context); context->handler.data = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, _explicit_context_data, context); - if (!context->handler.add - || !context->handler.del - || !context->handler.data) + if ((!context->handler.add) + || (!context->handler.del) + || (!context->handler.data)) goto on_error; context->requests_lookup = eina_hash_int32_new(_explicit_context_cancel_request); @@ -288,9 +288,9 @@ if (type > EXPLICIT_CALLBACK_APPROVAL) return EINA_FALSE; EINA_LIST_FOREACH(context->callbacks, l, callback) - if (callback->type == type - && callback->cb == cb - && callback->data == data) + if ((callback->type == type) + && (callback->cb == cb) + && (callback->data == data)) { context->callbacks = eina_list_remove_list(context->callbacks, l); free(callback); Index: PROTO/exchange/src/lib/exchange_local_theme.c =================================================================== --- PROTO/exchange/src/lib/exchange_local_theme.c (revision 51690) +++ PROTO/exchange/src/lib/exchange_local_theme.c (working copy) @@ -132,7 +132,7 @@ DBG("0 %s\n", file); - if (!file || !ecore_file_exists(file)) return NULL; + if ((!file) || (!ecore_file_exists(file))) return NULL; //EINA_ERROR_PDBG("1 %s\n", file); td = calloc(1, sizeof(Exchange_Object)); if (!td) return NULL; @@ -173,7 +173,7 @@ DBG("%s\n", dir); - if (!dir || !ecore_file_is_dir(dir)) + if ((!dir) || (!ecore_file_is_dir(dir))) { ERR("Local dir not valid '%s'\n", dir); return NULL; @@ -186,7 +186,7 @@ char *ext; ext = strrchr(filename, '.'); - if (!ext || strcmp(ext, ".edj")) + if ((!ext) || (strcmp(ext, ".edj"))) { free(filename); continue; Index: PROTO/exchange/src/lib/exchange_async.c =================================================================== --- PROTO/exchange/src/lib/exchange_async.c (revision 51690) +++ PROTO/exchange/src/lib/exchange_async.c (working copy) @@ -94,9 +94,9 @@ void _start_element_async_list_cb(Async_List_Parser *state, const xmlChar *name, const xmlChar **attrs) { - if (!strcmp((char *)name, "theme") || - !strcmp((char *)name, "application") || - !strcmp((char *)name, "module")) + if ((!strcmp((char *)name, "theme")) || + (!strcmp((char *)name, "application")) || + (!strcmp((char *)name, "module"))) { state->current = calloc(1, sizeof(Exchange_Object)); state->state = PARSER_LIST; @@ -147,9 +147,9 @@ void _end_element_async_list_cb(Async_List_Parser *state, const xmlChar *name) { - if (!strcmp((char *)name, "theme") || - !strcmp((char *)name, "application") || - !strcmp((char *)name, "module")) + if ((!strcmp((char *)name, "theme")) || + (!strcmp((char *)name, "application")) || + (!strcmp((char *)name, "module"))) { state->l = eina_list_append(state->l, state->current); state->state = PARSER_START; @@ -294,9 +294,9 @@ snprintf(url, sizeof(url), "http://exchange.enlightenment.org/api/list?object="); - if (group_title && !strcmp(group_title, "Applications")) + if ((group_title) && (!strcmp(group_title, "Applications"))) strcat(url, "application"); - else if (group_title && !strcmp(group_title, "Modules")) + else if ((group_title) && (!strcmp(group_title, "Modules"))) strcat(url, "module"); else { @@ -433,7 +433,7 @@ { Exchange_Download_Data *dd = data; - if (!dd || !dd->obj) return; + if ((!dd) || (!dd->obj)) return; if (dd->type == DOWNLOAD_THUMBNAIL) dd->obj->job_thumbnail = NULL; @@ -442,7 +442,7 @@ else if (dd->type == DOWNLOAD_ENTRY) dd->obj->job_entry = NULL; - if (status == 0 && dd->dst) + if ((status == 0) && (dd->dst)) { if (ecore_file_exists(dd->dst)) ecore_file_unlink(dd->dst); @@ -461,7 +461,7 @@ char dst[4096]; char tmpf[] = "/tmp/exchXXXXXX"; - if (!obj || !cb || !obj->thumbnail || obj->id < 0 || !mktemp(tmpf)) + if ((!obj) || (!cb) || (!obj->thumbnail) || (obj->id < 0) || (!mktemp(tmpf))) return EINA_FALSE; if (obj->job_thumbnail) return EINA_FALSE; @@ -516,7 +516,7 @@ char dst[4096]; //TODO PATH_MAX char tmpf[] = "/tmp/exchXXXXXX"; - if (!obj || !cb || !obj->screenshot || obj->id < 0 || !mktemp(tmpf)) + if ((!obj) || (!cb) || (!obj->screenshot) || (obj->id < 0) || (!mktemp(tmpf))) return EINA_FALSE; if (obj->job_screenshot) return EINA_FALSE; @@ -572,7 +572,7 @@ char dst[4096]; //TODO PATH_MAX char tmpf[] = "/tmp/exchXXXXXX"; - if (!obj || !path || !cb || !obj->url || obj->id < 0 || !mktemp(tmpf)) + if ((!obj) || (!path) || (!cb) || (!obj->url) || (obj->id < 0) || (!mktemp(tmpf))) return EINA_FALSE; if (obj->job_entry) return EINA_FALSE; @@ -631,7 +631,7 @@ char dst[4096]; char *local_version; - if (!obj || !ecore_file_is_dir(path)) + if ((!obj) || (!ecore_file_is_dir(path))) return EINA_FALSE; snprintf(dst, sizeof(dst), "%s/%s", path, exchange_obj_file_name_get(obj)); @@ -642,7 +642,7 @@ // no version available, assume the theme is updated local_version = exchange_local_theme_version_get(dst); - if (!obj->version || !local_version) + if ((!obj->version) || (!local_version)) return EINA_FALSE; // different version, update available ! Index: PROTO/exchange/src/lib/exchange.c =================================================================== --- PROTO/exchange/src/lib/exchange.c (revision 51690) +++ PROTO/exchange/src/lib/exchange.c (working copy) @@ -164,7 +164,7 @@ snprintf(buf, sizeof(buf), "%s/.cache/exchange.org", _exchange_user_homedir_get()); - if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf)) + if ((!ecore_file_exists(buf)) && (!ecore_file_mkpath(buf))) { ERR("Can't create cache dir '%s'\n", buf); return NULL; Index: PROTO/edvi/src/plugins/ewl/ewl_dvi.c =================================================================== --- PROTO/edvi/src/plugins/ewl/ewl_dvi.c (revision 51690) +++ PROTO/edvi/src/plugins/ewl/ewl_dvi.c (working copy) @@ -186,7 +186,7 @@ l1 = strlen (path); l2 = strlen (filename); - if (!path || (path[0] == '\0')) + if ((!path) || (path[0] == '\0')) file = strdup (filename); else { file = (char *)malloc (sizeof (char) * (l1 + l2 + 2)); Index: PROTO/edvi/src/lib/edvi_device.c =================================================================== --- PROTO/edvi/src/lib/edvi_device.c (revision 51690) +++ PROTO/edvi/src/lib/edvi_device.c (working copy) @@ -171,7 +171,7 @@ void edvi_device_evas_object_set (Edvi_Device *device, Evas_Object *o) { - if (!device || !o) + if ((!device) || (!o)) return; _edvi_device_o = o; @@ -180,7 +180,7 @@ void edvi_device_framebuffer_set (Edvi_Device *device, Edvi_Framebuffer *fb) { - if (!device || !fb) + if ((!device) || (!fb)) return; if (_edvi_device_fb) Index: PROTO/edvi/src/lib/edvi_page.c =================================================================== --- PROTO/edvi/src/lib/edvi_page.c (revision 51690) +++ PROTO/edvi/src/lib/edvi_page.c (working copy) @@ -104,7 +104,7 @@ double ph; int res; - if (!page || ! device || !o) + if ((!page) || (! device) || (!o)) return; if (DVI_parse_paper_size (_edvi_format_string_get (page), &pw, &ph) < 0) Index: PROTO/edvi/src/lib/etk_dvi.c =================================================================== --- PROTO/edvi/src/lib/etk_dvi.c (revision 51690) +++ PROTO/edvi/src/lib/etk_dvi.c (working copy) @@ -84,7 +84,7 @@ { Etk_Widget *widget; - if (!(widget = ETK_WIDGET(dvi)) || (dvi->filename == filename)) + if ((!(widget = ETK_WIDGET(dvi))) || (dvi->filename == filename)) return; free(dvi->filename); @@ -122,8 +122,8 @@ */ void etk_dvi_page_set(Etk_Dvi *dvi, int page) { - if (!dvi || - !dvi->dvi_document || + if ((!dvi) || + (!dvi->dvi_document) || (page >= edvi_document_page_count_get (dvi->dvi_document)) || (page == edvi_page_page_get(dvi->dvi_page))) return; @@ -174,7 +174,7 @@ */ void etk_dvi_orientation_set (Etk_Dvi *dvi, Edvi_Page_Orientation o) { - if (!dvi || !dvi->dvi_page) + if ((!dvi) || (!dvi->dvi_page)) return; edvi_page_orientation_set(dvi->dvi_page, o); @@ -189,7 +189,7 @@ */ Edvi_Page_Orientation etk_dvi_orientation_get (Etk_Dvi *dvi) { - if (!dvi || !dvi->dvi_page) + if ((!dvi) || (!dvi->dvi_page)) return EDVI_PAGE_ORIENTATION_PORTRAIT; return edvi_page_orientation_get (dvi->dvi_page); @@ -344,7 +344,7 @@ { Etk_Dvi *dvi; - if (!(dvi = ETK_DVI(object)) || !value) + if ((!(dvi = ETK_DVI(object))) || (!value)) return; switch (property_id) @@ -362,7 +362,7 @@ { Etk_Dvi *dvi; - if (!(dvi = ETK_DVI(object)) || !value) + if ((!(dvi = ETK_DVI(object))) || (!value)) return; switch (property_id) @@ -380,7 +380,7 @@ { Etk_Dvi *dvi; - if (!(dvi = ETK_DVI(widget)) || !size_requisition) + if ((!(dvi = ETK_DVI(widget))) || (!size_requisition)) return; if (dvi->dvi_object) @@ -441,7 +441,7 @@ Evas *evas; /* Evas_Object *o; */ - if (!(dvi = ETK_DVI(object)) || !(evas = etk_widget_toplevel_evas_get(ETK_WIDGET(dvi)))) + if ((!(dvi = ETK_DVI(object))) || (!(evas = etk_widget_toplevel_evas_get(ETK_WIDGET(dvi))))) return ETK_FALSE; /* o = evas_object_rectangle_add(evas); */ @@ -488,7 +488,7 @@ { Evas *evas; - if (!dvi->dvi_object && (evas = etk_widget_toplevel_evas_get(widget))) + if ((!dvi->dvi_object) && (evas = etk_widget_toplevel_evas_get(widget))) { dvi->dvi_object = evas_object_image_add(evas); etk_widget_member_object_add(widget, dvi->dvi_object); Index: PROTO/edvi/src/lib/edvi_document.c =================================================================== --- PROTO/edvi/src/lib/edvi_document.c (revision 51690) +++ PROTO/edvi/src/lib/edvi_document.c (working copy) @@ -21,7 +21,7 @@ { Edvi_Document *document; - if (!filename || !device || !property) + if ((!filename) || (!device) || (!property)) return NULL; document = (Edvi_Document *)malloc (sizeof (Edvi_Document)); @@ -59,7 +59,7 @@ int edvi_document_page_count_get (const Edvi_Document *document) { - if (!document || !document->dvi_document) + if ((!document) || (!document->dvi_document)) return 0; return document->dvi_document->pages; Index: PROTO/edvi/src/lib/ewl_dvi.c =================================================================== --- PROTO/edvi/src/lib/ewl_dvi.c (revision 51690) +++ PROTO/edvi/src/lib/ewl_dvi.c (working copy) @@ -119,7 +119,7 @@ w = EWL_WIDGET(dvi); emb = ewl_embed_widget_find(w); - if (!filename || (filename[0] == '\0')) + if ((!filename) || (filename[0] == '\0')) DRETURN_INT(FALSE, DLEVEL_STABLE); if (dvi->filename != filename) { @@ -190,8 +190,8 @@ DCHECK_PARAM_PTR(dvi); DCHECK_TYPE(dvi, EWL_DVI_TYPE); - if (!dvi->dvi_document || - !dvi->dvi_page || + if ((!dvi->dvi_document) || + (!dvi->dvi_page) || (page < 0) || (page >= edvi_document_page_count_get(dvi->dvi_document)) || (page == edvi_page_page_get(dvi->dvi_page))) @@ -262,7 +262,7 @@ DCHECK_PARAM_PTR(dvi); DCHECK_TYPE(dvi, EWL_DVI_TYPE); - if (!dvi->dvi_page || (edvi_page_orientation_get(dvi->dvi_page) == o)) + if ((!dvi->dvi_page) || (edvi_page_orientation_get(dvi->dvi_page) == o)) DRETURN(DLEVEL_STABLE); dvi->dirty = 1; @@ -497,7 +497,7 @@ emb = ewl_embed_widget_find(w); dvi = EWL_DVI(w); - if (emb && dvi->image) { + if ((emb) && (dvi->image)) { ewl_embed_object_cache(emb, dvi->image); dvi->image = NULL; } @@ -531,7 +531,7 @@ DCHECK_TYPE(w, EWL_WIDGET_TYPE); dvi = EWL_DVI(w); - if (!dvi->image || !dvi->dvi_page) + if ((!dvi->image) || (!dvi->dvi_page)) DRETURN(DLEVEL_STABLE); emb = ewl_embed_widget_find(w); Index: PROTO/edvi/src/lib/edvi_framebuffer.c =================================================================== --- PROTO/edvi/src/lib/edvi_framebuffer.c (revision 51690) +++ PROTO/edvi/src/lib/edvi_framebuffer.c (working copy) @@ -50,7 +50,7 @@ void edvi_framebuffer_clear (Edvi_Framebuffer *framebuffer) { - if (!framebuffer || !framebuffer->dvi_framebuffer) + if ((!framebuffer) || (!framebuffer->dvi_framebuffer)) return; DVI_fb_clear (framebuffer->dvi_framebuffer); Index: PROTO/edvi/src/lib/esmart_dvi.c =================================================================== --- PROTO/edvi/src/lib/esmart_dvi.c (revision 51690) +++ PROTO/edvi/src/lib/esmart_dvi.c (working copy) @@ -193,7 +193,7 @@ E_SMART_OBJ_GET(sp, obj, E_OBJ_NAME); - if (!sp->dvi_document || + if ((!sp->dvi_document) || (page < 0) || (page >= edvi_document_page_count_get (sp->dvi_document)) || (page == edvi_page_page_get (sp->dvi_page))) Index: PROTO/edvi/src/bin/ewl_test_dvi.c =================================================================== --- PROTO/edvi/src/bin/ewl_test_dvi.c (revision 51690) +++ PROTO/edvi/src/bin/ewl_test_dvi.c (working copy) @@ -143,7 +143,7 @@ l1 = strlen (path); l2 = strlen (filename); - if (!path || (path[0] == '\0')) + if ((!path) || (path[0] == '\0')) file = strdup (filename); else { file = (char *)malloc (sizeof (char) * (l1 + l2 + 2)); Index: PROTO/e_phys/src/lib/e_phys_world.c =================================================================== --- PROTO/e_phys/src/lib/e_phys_world.c (revision 51690) +++ PROTO/e_phys/src/lib/e_phys_world.c (working copy) @@ -138,7 +138,7 @@ d.y = p->cur.y - y; r = sqrt(d.x * d.x + d.y * d.y); - if (!nearest || r < distance) + if ((!nearest) || (r < distance)) { nearest = p; distance = r; @@ -181,7 +181,7 @@ for (l = world->forces; l; l = l->next) { E_Phys_Force *force = l->data; - if (force && force->apply) force->apply(force); + if ((force) && (force->apply)) force->apply(force); } } @@ -216,7 +216,7 @@ for (l = world->constraints; l; l = l->next) { E_Phys_Constraint *con = l->data; - if (con && con->apply) con->apply(con); + if ((con) && (con->apply)) con->apply(con); } } Index: PROTO/e_phys/src/lib/e_phys_map.c =================================================================== --- PROTO/e_phys/src/lib/e_phys_map.c (revision 51690) +++ PROTO/e_phys/src/lib/e_phys_map.c (working copy) @@ -61,8 +61,8 @@ float *ncoord; ncoord = ((float *)walk->neighbor[walkd]) + coff; - if ((walkd < neighbord && (*coord < *ncoord)) || - (walkd > neighbord && (*coord > *ncoord))) { + if (((walkd < neighbord) && (*coord < *ncoord)) || + ((walkd > neighbord) && (*coord > *ncoord))) { head = walk->neighbor[walkd]; head->steps++; if (head->steps > newhead->steps) Index: PROTO/e_phys/src/lib/e_phys_force.c =================================================================== --- PROTO/e_phys/src/lib/e_phys_force.c (revision 51690) +++ PROTO/e_phys/src/lib/e_phys_force.c (working copy) @@ -76,7 +76,7 @@ //printf("Collide!\n"); - if ((!axis && p1->cur.y > p2->cur.y) || (axis && p1->cur.x > p2->cur.x)) + if (((!axis) && (p1->cur.y > p2->cur.y)) || ((axis) && (p1->cur.x > p2->cur.x))) { tmp = p1; p1 = p2; @@ -137,7 +137,7 @@ { E_Phys_Particle *p1; p1 = l->data; - if (p1->w == 0 && p1->h == 0) continue; + if ((p1->w == 0) && (p1->h == 0)) continue; x11 = p1->cur.x - p1->w / 2; x12 = p1->cur.x + p1->w / 2; @@ -148,7 +148,7 @@ { E_Phys_Particle *p2; p2 = l2->data; - if (p2->w == 0 && p2->h == 0) continue; + if ((p2->w == 0) && (p2->h == 0)) continue; x21 = p2->cur.x - p2->w / 2; x22 = p2->cur.x + p2->w / 2; @@ -200,7 +200,7 @@ Eina_List *l, *l2; - if (!force || !force->world) return; + if ((!force) || (!force->world)) return; // Gravity! for (l = force->world->particles; l; l = l->next) @@ -285,7 +285,7 @@ float r; float diff; - if (!sp->p1 || !sp->p2) return; + if ((!sp->p1) || (!sp->p2)) return; d.x = sp->p2->cur.x - sp->p1->cur.x; d.y = sp->p2->cur.y - sp->p1->cur.y; @@ -355,7 +355,7 @@ Eina_List *l; - if (!force || !force->world) return; + if ((!force) || (!force->world)) return; if (uni->force_func) f = uni->force_func(force->world->time); Index: PROTO/e_phys/src/bin/main.c =================================================================== --- PROTO/e_phys/src/bin/main.c (revision 51690) +++ PROTO/e_phys/src/bin/main.c (working copy) @@ -309,7 +309,7 @@ o = evas_object_rectangle_add(app->evas); evas_object_color_set(o, 0, 0, 0, 50 + ((float)i / num_p) * 205); } - if (p->w && p->h) + if ((p->w) && (p->h)) { evas_object_resize(o, p->w, p->h); evas_object_image_fill_set(o, 0, 0, p->w, p->h); Index: PROTO/e_phys/src/bin/test_snow.c =================================================================== --- PROTO/e_phys/src/bin/test_snow.c (revision 51690) +++ PROTO/e_phys/src/bin/test_snow.c (working copy) @@ -67,7 +67,7 @@ E_Phys_World *world; Constraint_Wrap *cw = (Constraint_Wrap *)con; - if (!con || !con->world) return; + if ((!con) || (!con->world)) return; world = con->world; for (l = world->particles; l; l = l->next) Index: PROTO/eps/src/lib/eps_page.c =================================================================== --- PROTO/eps/src/lib/eps_page.c (revision 51690) +++ PROTO/eps/src/lib/eps_page.c (working copy) @@ -72,7 +72,7 @@ int stride; int yy; - if (!page || !o) + if ((!page) || (!o)) return; spectre_page_render (page->page, page->rc, @@ -128,7 +128,7 @@ int stride; int yy; - if (!page || !o || (width <= 0) || (height <= 0)) + if ((!page) || (!o) || (width <= 0) || (height <= 0)) return; spectre_page_render_slice (page->page, page->rc, @@ -210,7 +210,7 @@ int w = 0; int h = 0; - if (page && page->page) { + if ((page) && (page->page)) { spectre_page_get_size (page->page, &w, &h); orientation = spectre_page_get_orientation (page->page); switch (orientation) { Index: PROTO/eps/src/lib/eps_document.c =================================================================== --- PROTO/eps/src/lib/eps_document.c (revision 51690) +++ PROTO/eps/src/lib/eps_document.c (working copy) @@ -14,7 +14,7 @@ Eps_Document *document; SpectreStatus status; - if (!filename || (filename[0] == '\0')) + if ((!filename) || (filename[0] == '\0')) return NULL; document = (Eps_Document *)malloc (sizeof (Eps_Document)); Index: PROTO/eps/src/lib/etk_ps.c =================================================================== --- PROTO/eps/src/lib/etk_ps.c (revision 51690) +++ PROTO/eps/src/lib/etk_ps.c (working copy) @@ -78,7 +78,7 @@ { Etk_Widget *widget; - if (!(widget = ETK_WIDGET(ps)) || (ps->filename == filename)) + if ((!(widget = ETK_WIDGET(ps))) || (ps->filename == filename)) return 0; free(ps->filename); @@ -126,8 +126,8 @@ */ void etk_ps_page_set(Etk_Ps *ps, int page) { - if (!ps || - !ps->ps_document || + if ((!ps) || + (!ps->ps_document) || (page < 0) || (page >= eps_document_page_count_get(ps->ps_document)) || (page == eps_page_page_get(ps->ps_page))) @@ -180,7 +180,7 @@ */ void etk_ps_orientation_set(Etk_Ps *ps, Eps_Page_Orientation o) { - if (!ps || !ps->ps_page) + if ((!ps) || (!ps->ps_page)) return; eps_page_orientation_set(ps->ps_page, o); @@ -195,7 +195,7 @@ */ Eps_Page_Orientation etk_ps_orientation_get(Etk_Ps *ps) { - if (!ps || !ps->ps_page) + if ((!ps) || (!ps->ps_page)) return EPS_PAGE_ORIENTATION_PORTRAIT; return eps_page_orientation_get(ps->ps_page); @@ -346,7 +346,7 @@ { Etk_Ps *ps; - if (!(ps = ETK_PS(object)) || !value) + if ((!(ps = ETK_PS(object))) || (!value)) return; switch (property_id) @@ -364,7 +364,7 @@ { Etk_Ps *ps; - if (!(ps = ETK_PS(object)) || !value) + if ((!(ps = ETK_PS(object))) || (!value)) return; switch (property_id) @@ -382,7 +382,7 @@ { Etk_Ps *ps; - if (!(ps = ETK_PS(widget)) || !size_requisition) + if ((!(ps = ETK_PS(widget))) || (!size_requisition)) return; if (ps->ps_object) @@ -442,7 +442,7 @@ Etk_Ps *ps; Evas *evas; - if (!(ps = ETK_PS(object)) || !(evas = etk_widget_toplevel_evas_get(ETK_WIDGET(ps)))) + if ((!(ps = ETK_PS(object))) || (!(evas = etk_widget_toplevel_evas_get(ETK_WIDGET(ps))))) return; _etk_ps_load(ps); } @@ -481,7 +481,7 @@ { Evas *evas; - if (!ps->ps_object && (evas = etk_widget_toplevel_evas_get(widget))) + if ((!ps->ps_object) && (evas = etk_widget_toplevel_evas_get(widget))) { ps->ps_object = evas_object_image_add(evas); etk_widget_member_object_add(widget, ps->ps_object); Index: PROTO/eps/src/lib/ewl_ps.c =================================================================== --- PROTO/eps/src/lib/ewl_ps.c (revision 51690) +++ PROTO/eps/src/lib/ewl_ps.c (working copy) @@ -116,7 +116,7 @@ if (ps->filename != filename) { IF_FREE(ps->filename); } - if (!filename || (filename[0] == '\0')) + if ((!filename) || (filename[0] == '\0')) DRETURN_INT(FALSE, DLEVEL_STABLE); if (ps->ps_page) { @@ -184,8 +184,8 @@ DCHECK_PARAM_PTR(ps); DCHECK_TYPE(ps, EWL_PS_TYPE); - if (!ps->ps_document || - !ps->ps_page || + if ((!ps->ps_document) || + (!ps->ps_page) || (page < 0) || (page >= eps_document_page_count_get(ps->ps_document)) || (page == eps_page_page_get(ps->ps_page))) @@ -256,7 +256,7 @@ DCHECK_PARAM_PTR(ps); DCHECK_TYPE(ps, EWL_PS_TYPE); - if (!ps->ps_page || (eps_page_orientation_get(ps->ps_page) == o)) + if ((!ps->ps_page) || (eps_page_orientation_get(ps->ps_page) == o)) DLEAVE_FUNCTION(DLEVEL_STABLE); ps->dirty = 1; @@ -511,7 +511,7 @@ emb = ewl_embed_widget_find(w); ps = EWL_PS(w); - if (emb && ps->image) { + if ((emb) && (ps->image)) { ewl_embed_object_cache(emb, ps->image); ps->image = NULL; } Index: PROTO/eps/src/lib/esmart_ps.c =================================================================== --- PROTO/eps/src/lib/esmart_ps.c (revision 51690) +++ PROTO/eps/src/lib/esmart_ps.c (working copy) @@ -189,7 +189,7 @@ E_SMART_OBJ_GET(sp, obj, E_OBJ_NAME); - if (!sp->ps_document || + if ((!sp->ps_document) || (page < 0) || (page >= eps_document_page_count_get (sp->ps_document)) || (page == eps_page_page_get (sp->ps_page))) Index: PROTO/eupnp/src/lib/eupnp_event_bus.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_event_bus.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_event_bus.c (working copy) @@ -284,7 +284,7 @@ { CHECK_NULL_RET(cb, NULL); - if (event_type < 0 || event_type >= _event_max) + if ((event_type < 0) || (event_type >= _event_max)) { ERR("Failed to subscribe for event type %d, callback %p, data %p", event_type, cb, user_data); return NULL; Index: PROTO/eupnp/src/lib/eupnp_utils.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_utils.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_utils.c (working copy) @@ -126,10 +126,10 @@ if (!ifa->ifa_addr) continue; - if ((ifa->ifa_flags & IFF_LOOPBACK) || !(ifa->ifa_flags & IFF_UP)) continue; + if ((ifa->ifa_flags & IFF_LOOPBACK) || (!(ifa->ifa_flags & IFF_UP))) continue; /* If a name was specified, check it */ - if (name && strcmp (name, ifa->ifa_name) != 0) continue; + if ((name) && (strcmp (name, ifa->ifa_name) != 0)) continue; p = NULL; @@ -199,7 +199,7 @@ /* If we got a device name and destination, and the destination * is 0, then we have the default route */ - if (ret == 2 && dest == 0) + if ((ret == 2) && (dest == 0)) { found = EINA_TRUE; break; Index: PROTO/eupnp/src/lib/eupnp_service_proxy.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_service_proxy.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_service_proxy.c (working copy) @@ -647,8 +647,8 @@ { char *complete_url = NULL; - if ((base_url[strlen(base_url)] == '/' && scpd_url[0] != '/') || - (base_url[strlen(base_url)] != '/' && scpd_url[0] == '/')) + if (((base_url[strlen(base_url)] == '/') && (scpd_url[0] != '/')) || + ((base_url[strlen(base_url)] != '/') && (scpd_url[0] == '/'))) { if (asprintf(&complete_url, "%s%s", base_url, scpd_url) < 0) { Index: PROTO/eupnp/src/lib/eupnp_ssdp.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_ssdp.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_ssdp.c (working copy) @@ -279,7 +279,7 @@ goto on_resp_error; } - if (service_type && udn) + if ((service_type) && (udn)) { service_info = eupnp_service_info_new(udn, location, service_type, r, (void *)eupnp_http_response_free); Index: PROTO/eupnp/src/lib/eupnp_device_info.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_device_info.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_device_info.c (working copy) @@ -204,7 +204,7 @@ { ERR("Failed to allocate memory for device info"); - if (resource && resource_free) + if ((resource) && (resource_free)) resource_free(resource); return NULL; Index: PROTO/eupnp/src/lib/eupnp_service_info.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_service_info.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_service_info.c (working copy) @@ -128,7 +128,7 @@ if (!d) { ERR("Failed to allocate memory for service info"); - if (resource && resource_free) + if ((resource) && (resource_free)) resource_free(resource); return NULL; } Index: PROTO/eupnp/src/lib/eupnp_device_parser.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_device_parser.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_device_parser.c (working copy) @@ -143,10 +143,10 @@ embedded->spec_version_major = d->spec_version_major; embedded->spec_version_minor = d->spec_version_minor; - if (d->location && !embedded->location) + if ((d->location) && (!embedded->location)) embedded->location = strdup(d->location); - if (d->base_url && !embedded->base_url) + if ((d->base_url) && (!embedded->base_url)) embedded->base_url = strdup(d->base_url); _embedded_devices_parse_finish(embedded); Index: PROTO/eupnp/src/lib/eupnp_http_message.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_http_message.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_http_message.c (working copy) @@ -122,7 +122,7 @@ // Move to the first char after ':' and check if the header value is empty. *hvalue = end + 1; - if (**hvalue == '\r' && *(*hvalue+1) == '\n') + if ((**hvalue == '\r') && (*(*hvalue+1) == '\n')) { DBG("Empty header value!"); *line_start = *hvalue + 2; @@ -133,7 +133,7 @@ // Header value not empty, skip whitespaces before the actual value. while (**hvalue == ' ') (*hvalue)++; - if (**hvalue == '\r' && *(*hvalue+1) == '\n') + if ((**hvalue == '\r') && (*(*hvalue+1) == '\n')) { DBG("Empty header value!"); *line_start = *hvalue + 2; @@ -154,7 +154,7 @@ *hvalue_len = end - *hvalue + 1; - if (*(end + 2) == '\n' && *(end + 3) == '\r' && *(end + 4) == '\n') + if ((*(end + 2) == '\n') && (*(end + 3) == '\r') && (*(end + 4) == '\n')) { *line_start = end + 5; *payload = 1; @@ -343,7 +343,7 @@ free(h); // Free the resource - if (resource && resource_free) + if ((resource) && (resource_free)) resource_free(resource); return NULL; @@ -379,7 +379,7 @@ } /* Free the shared resource */ - if (r->_resource && r->_resource_free) + if ((r->_resource) && (r->_resource_free)) r->_resource_free(r->_resource); free(r); @@ -553,7 +553,7 @@ free(r); // Free the resource - if (resource && resource_free) + if ((resource) && (resource_free)) resource_free(resource); return NULL; Index: PROTO/eupnp/src/lib/eupnp_av/eupnp_av.c =================================================================== --- PROTO/eupnp/src/lib/eupnp_av/eupnp_av.c (revision 51690) +++ PROTO/eupnp/src/lib/eupnp_av/eupnp_av.c (working copy) @@ -328,7 +328,7 @@ /* trim spaces */ while (isspace(*ch)) { len--; ch++; } end = ch + len - 1; - while (end > (const char *)ch && isspace(*end)) { end--; len--; } + while ((end > (const char *)ch) && (isspace(*end))) { end--; len--; } switch (c->state) { Index: PROTO/eupnp/tools/lighting/lighting.c =================================================================== --- PROTO/eupnp/tools/lighting/lighting.c (revision 51690) +++ PROTO/eupnp/tools/lighting/lighting.c (working copy) @@ -117,7 +117,7 @@ const Eina_List *items = elm_list_items_get(devices); const Eina_List *l; Elm_List_Item *item = NULL; - if (!items || !eina_list_count(items)) return EINA_FALSE; + if ((!items) || (!eina_list_count(items))) return EINA_FALSE; EINA_LIST_FOREACH(items, l, item) { @@ -169,8 +169,8 @@ { Eupnp_Device_Info *device = event_data; - if (!(!strcmp(device->device_type, BINARY_LIGHT_TYPE) || - !strcmp(device->device_type, DIMMABLE_LIGHT_TYPE))) + if (!((!strcmp(device->device_type, BINARY_LIGHT_TYPE)) || + (!strcmp(device->device_type, DIMMABLE_LIGHT_TYPE)))) return; DBG("Found device %p : %s", device, device->udn); Index: PROTO/eupnp/examples/media_server_browser.c =================================================================== --- PROTO/eupnp/examples/media_server_browser.c (revision 51690) +++ PROTO/eupnp/examples/media_server_browser.c (working copy) @@ -288,7 +288,7 @@ cds = eupnp_device_info_service_get_by_type(device, CDS_SERVICE_TYPE); - if ((!cds) || is_server_known(device)) + if ((!cds) || (is_server_known(device))) return EINA_TRUE; ms = calloc(1, sizeof(Media_Server)); Index: PROTO/libeweather/src/lib/plugins.c =================================================================== --- PROTO/libeweather/src/lib/plugins.c (revision 51690) +++ PROTO/libeweather/src/lib/plugins.c (working copy) @@ -50,7 +50,7 @@ EINA_ARRAY_ITER_NEXT(array, i, m, it) { EWeather_Plugin *plugin = eina_module_symbol_get(m, "_plugin_class"); - if(plugin && !strcmp(name, plugin->name)) + if((plugin) && (!strcmp(name, plugin->name))) return m; } @@ -68,7 +68,7 @@ EINA_ARRAY_ITER_NEXT(array, i, m, it) { EWeather_Plugin *plugin = eina_module_symbol_get(m, "_plugin_class"); - if(plugin && !strcmp(name, plugin->name)) + if((plugin) && (!strcmp(name, plugin->name))) return i; } Index: PROTO/libeweather/src/lib/eweather.c =================================================================== --- PROTO/libeweather/src/lib/eweather.c (revision 51690) +++ PROTO/libeweather/src/lib/eweather.c (working copy) @@ -45,7 +45,7 @@ EINA_ARRAY_ITER_NEXT(array, i, m, it) { EWeather_Plugin *plugin = eina_module_symbol_get(m, "_plugin_class"); - if(plugin && !strcmp(name, plugin->name)) + if((plugin) && (!strcmp(name, plugin->name))) { eweather_plugin_set(eweather, m); break ; @@ -57,7 +57,7 @@ { eweather->poll_time = poll_time; - if(eweather->plugin.plugin && eweather->plugin.plugin->poll_time_updated) + if((eweather->plugin.plugin) && (eweather->plugin.plugin->poll_time_updated)) eweather->plugin.plugin->poll_time_updated(eweather); } @@ -67,7 +67,7 @@ eina_stringshare_del(eweather->code); eweather->code = eina_stringshare_add(code); - if(eweather->plugin.plugin && eweather->plugin.plugin->code_updated) + if((eweather->plugin.plugin) && (eweather->plugin.plugin->code_updated)) eweather->plugin.plugin->code_updated(eweather); } Index: PROTO/libeweather/src/lib/eweather_smart.c =================================================================== --- PROTO/libeweather/src/lib/eweather_smart.c (revision 51690) +++ PROTO/libeweather/src/lib/eweather_smart.c (working copy) @@ -190,13 +190,13 @@ else i++; } - if(o && sd->mode == EWEATHER_OBJECT_MODE_EXPOSE) + if((o) && (sd->mode == EWEATHER_OBJECT_MODE_EXPOSE)) { sd->current_day = i; update_main(obj); } - if(o && sd->mode == EWEATHER_OBJECT_MODE_EXPOSE) + if((o) && (sd->mode == EWEATHER_OBJECT_MODE_EXPOSE)) { eweather_object_mode_set(obj, EWEATHER_OBJECT_MODE_FULLSCREEN); } @@ -445,7 +445,7 @@ for(j=0; jobjs); i++) + for(i=0; (iobjs)); i++) { Evas_Object *o = eina_list_data_get(l); l = eina_list_next(l); Index: PROTO/ekeko/src/lib/ekeko_object.c =================================================================== --- PROTO/ekeko/src/lib/ekeko_object.c (revision 51690) +++ PROTO/ekeko/src/lib/ekeko_object.c (working copy) @@ -362,7 +362,7 @@ Ekeko_Object_Private *pprv, *oprv; Ekeko_Event_Mutation evt; - if (!p || !o) + if ((!p) || (!o)) return; pprv = PRIVATE(p); @@ -507,7 +507,7 @@ void *curr, *prev; - if (!o || !name) + if ((!o) || (!name)) return EINA_FALSE; prv = PRIVATE(o); @@ -521,7 +521,7 @@ if (prop->type == EKEKO_PROPERTY_UNDEFINED) return EINA_FALSE; - if (prop->type != EKEKO_PROPERTY_VALUE && prop->type != value->type) + if ((prop->type != EKEKO_PROPERTY_VALUE) && (prop->type != value->type)) { ERR("Value types dont match %s.%s %d %d\n", ekeko_object_type_name_get(o), name, prop->type, value->type); @@ -600,7 +600,7 @@ Ekeko_Object_Private *prv; Object_Property *prop; - if (!name || !o) return EKEKO_PROPERTY_UNDEFINED; + if ((!name) || (!o)) return EKEKO_PROPERTY_UNDEFINED; prv = PRIVATE(o); prop = eina_hash_find(prv->properties, name); @@ -639,7 +639,7 @@ Ekeko_Object_Private *prv; Object_Property *prop; - if (!name || !o) return NULL; + if ((!name) || (!o)) return NULL; prv = PRIVATE(o); prop = eina_hash_find(prv->properties, name); @@ -707,7 +707,7 @@ */ EAPI Ekeko_Object * ekeko_object_cast(Ekeko_Object *o, Ekeko_Type *t) { - if (!o || !t) + if ((!o) || (!t)) return NULL; if (!ekeko_type_instance_is_of_type(o, t)) { Index: PROTO/ekeko/src/lib/ekeko_value.c =================================================================== --- PROTO/ekeko/src/lib/ekeko_value.c (revision 51690) +++ PROTO/ekeko/src/lib/ekeko_value.c (working copy) @@ -161,10 +161,10 @@ static Eina_Bool _rectangle_cmp(Ekeko_Value *v1, Ekeko_Value *v2) { - if (v1->value.rect.x == v2->value.rect.x && - v1->value.rect.y == v2->value.rect.y && - v1->value.rect.w == v2->value.rect.w && - v1->value.rect.h == v2->value.rect.h) + if ((v1->value.rect.x == v2->value.rect.x) && + (v1->value.rect.y == v2->value.rect.y) && + (v1->value.rect.w == v2->value.rect.w) && + (v1->value.rect.h == v2->value.rect.h)) return EINA_FALSE; return EINA_TRUE; } Index: PROTO/eyelight_edit/src/bin/slideshow.c =================================================================== --- PROTO/eyelight_edit/src/bin/slideshow.c (revision 51690) +++ PROTO/eyelight_edit/src/bin/slideshow.c (working copy) @@ -185,8 +185,8 @@ if(is_help) { - if(action == EYELIGHT_HELP - || action == EYELIGHT_QUIT) + if((action == EYELIGHT_HELP) + || (action == EYELIGHT_QUIT)) { is_help = 0; evas_object_del(help_background); @@ -241,7 +241,7 @@ eyelight_object_gotoslide_digit_last_remove(eyelight_smart); break; default: - if (strlen(event->key) == 1 && strchr("0123456789", *event->key)) + if ((strlen(event->key) == 1) && (strchr("0123456789", *event->key))) eyelight_object_gotoslide_digit_add(eyelight_smart,atoi(event->key)); break; } @@ -314,7 +314,7 @@ return ; break; default: - if (strlen(event->key) == 1 && strchr("0123456789", *event->key)) + if ((strlen(event->key) == 1) && (strchr("0123456789", *event->key))) { eyelight_object_gotoslide_start(eyelight_smart); eyelight_object_gotoslide_digit_add(eyelight_smart,atoi(event->key)); Index: PROTO/eyelight_edit/src/bin/grid_object.c =================================================================== --- PROTO/eyelight_edit/src/bin/grid_object.c (revision 51690) +++ PROTO/eyelight_edit/src/bin/grid_object.c (working copy) @@ -368,11 +368,11 @@ x_cumul += w_obj; } - if(item->show && sd->item_selected != item && - (item->x+w_obj < region_x - || item->x > region_w + region_x - || item->y+h_obj < region_y - || item->y > region_h + region_y) ) + if((item->show) && (sd->item_selected != item) && + ((item->x+w_obj < region_x) + || (item->x > region_w + region_x) + || (item->y+h_obj < region_y) + || (item->y > region_h + region_y)) ) { evas_object_hide(item->obj); item->show = 0; @@ -437,7 +437,7 @@ id++; } - if(sd->move_next || sd->move_previous) + if((sd->move_next) || (sd->move_previous)) { //maybe we only have a next, or only a previous if(sd->move_previous) @@ -531,9 +531,9 @@ i_prev = i; } - if(item->x+x+ w_obj/4 > ev->cur.output.x - && item->y+y < ev->cur.output.y - && item->y+y+h_obj > ev->cur.output.y) + if((item->x+x+ w_obj/4 > ev->cur.output.x) + && (item->y+y < ev->cur.output.y) + && (item->y+y+h_obj > ev->cur.output.y)) { next = item; i_next = i; @@ -543,10 +543,10 @@ i++; } - if(!(i_prev == -1 && i_next == 1) && - (i_next - 1 == i_prev || i_prev == -1 || i_next == -1)) + if((!((i_prev == -1) && (i_next == 1))) && + ((i_next - 1 == i_prev) || (i_prev == -1) || (i_next == -1))) { - if(i_prev > -1 && sd->item_selected != previous) + if((i_prev > -1) && (sd->item_selected != previous)) { if(sd->move_previous != previous) { @@ -561,7 +561,7 @@ sd->move_previous = NULL; } - if(i_next > -1 && sd->item_selected != next) + if((i_next > -1) && (sd->item_selected != next)) { if(sd->move_next != next) { Index: PROTO/eyelight_edit/src/bin/slide_utils.c =================================================================== --- PROTO/eyelight_edit/src/bin/slide_utils.c (revision 51690) +++ PROTO/eyelight_edit/src/bin/slide_utils.c (working copy) @@ -207,10 +207,10 @@ { Eyelight_Edit *edit = (Eyelight_Edit*) data; - if(edit != _current_obj && strcmp(emission,"select")!=0) + if((edit != _current_obj) && (strcmp(emission,"select")!=0)) return ; - if(_current_obj && edit != _current_obj && strcmp(emission,"select")==0) + if((_current_obj) && (edit != _current_obj) && (strcmp(emission,"select")==0)) { utils_obj_unselect(); } @@ -225,8 +225,8 @@ rightpanel_area_show(); rightpanel_area_layout_set(eyelight_edit_area_layout_get(_current_obj)); } - if(strcmp(emission, "move,start") == 0 - || strcmp(emission, "resize,start") == 0) + if((strcmp(emission, "move,start") == 0) + || (strcmp(emission, "resize,start") == 0)) { presentation_thumbscroll_set(0); @@ -245,14 +245,14 @@ _x_save = x; _y_save = y; } - else if(strcmp(emission, "move,end") == 0 - || strcmp(emission, "resize,end") == 0) + else if((strcmp(emission, "move,end") == 0) + || (strcmp(emission, "resize,end") == 0)) { presentation_thumbscroll_set(1); _current_action = ACTION_NONE; } - else if(strcmp(emission, "move") == 0 - && (_current_action == ACTION_AREA_MOVE || _current_action == ACTION_AREA_RESIZE) ) + else if((strcmp(emission, "move") == 0) + && ((_current_action == ACTION_AREA_MOVE) || (_current_action == ACTION_AREA_RESIZE)) ) { int x,y, x_pres, y_pres, w_pres, h_pres, x_evas, y_evas; double rel_x, rel_y; @@ -264,7 +264,7 @@ x = x - x_pres - x_evas; y = y - y_pres - y_evas; - if(x<0 || x>= w_pres || y<0 || y>=h_pres) + if((x<0) || (x>= w_pres) || (y<0) || (y>=h_pres)) break; x -= _x_save; @@ -316,8 +316,8 @@ void utils_edit_area_up(void *data, Evas_Object *obj, void *event_info) { - if(eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_CUSTOM_AREA - && eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_THEME_AREA) + if((eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_CUSTOM_AREA) + && (eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_THEME_AREA)) return ; eyelight_edit_area_up(_current_obj); @@ -325,8 +325,8 @@ void utils_edit_area_down(void *data, Evas_Object *obj, void *event_info) { - if(eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_CUSTOM_AREA - && eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_THEME_AREA) + if((eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_CUSTOM_AREA) + && (eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_THEME_AREA)) return ; eyelight_edit_area_down(_current_obj); @@ -347,8 +347,8 @@ { Evas_Object *lbl, *tb, *bt; - if(eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_CUSTOM_AREA - && eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_THEME_AREA) + if((eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_CUSTOM_AREA) + && (eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_THEME_AREA)) return ; _inwin_delete_slide = elm_win_inwin_add(win); @@ -397,8 +397,8 @@ void utils_edit_area_image_add(void *data, Evas_Object *obj, void *event_info) { - if(eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_CUSTOM_AREA - && eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_THEME_AREA) + if((eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_CUSTOM_AREA) + && (eyelight_edit_name_get(_current_obj) != EYELIGHT_NAME_THEME_AREA)) return ; Evas_Object *inwin, *fs, *fr; @@ -560,8 +560,8 @@ //test if file is in a subdirectory of dir for(i=0;i= strlen(file) - || dir[i] != file[i]) + if((i >= strlen(file)) + || (dir[i] != file[i])) { ok = 0; break; Index: PROTO/enesim/src/lib/enesim_compositor.c =================================================================== --- PROTO/enesim/src/lib/enesim_compositor.c (revision 51690) +++ PROTO/enesim/src/lib/enesim_compositor.c (working copy) @@ -203,14 +203,14 @@ { if (!dfmt) return NULL; - if (*dfmt <= ENESIM_FORMAT_NONE && *dfmt > ENESIM_FORMATS) + if ((*dfmt <= ENESIM_FORMAT_NONE) && (*dfmt > ENESIM_FORMATS)) return NULL; - if (!sfmt && !mfmt) + if ((!sfmt) && (!mfmt)) { return _span_color_get(rop, dfmt, color); } - if (sfmt && mfmt) + if ((sfmt) && (mfmt)) { return _span_pixel_mask_get(rop, dfmt, sfmt, mfmt); } @@ -233,14 +233,14 @@ { if (!dfmt) return NULL; - if (*dfmt <= ENESIM_FORMAT_NONE && *dfmt > ENESIM_FORMATS) + if ((*dfmt <= ENESIM_FORMAT_NONE) && (*dfmt > ENESIM_FORMATS)) return NULL; - if (!sfmt && !mfmt) + if ((!sfmt) && (!mfmt)) { return _point_color_get(rop, dfmt, color); } - if (sfmt && mfmt) + if ((sfmt) && (mfmt)) { return _point_pixel_mask_get(rop, dfmt, sfmt, mfmt); } Index: PROTO/enesim/src/lib/renderer/checker.c =================================================================== --- PROTO/enesim/src/lib/renderer/checker.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/checker.c (working copy) @@ -125,14 +125,14 @@ p0 = color[0]; /* antialias the borders */ - if (sy == 0 || sy == s->sh) + if ((sy == 0) || (sy == s->sh)) { uint16_t a; a = 1 + ((syy & 0xffff) >> 8); p0 = INTERP_256(a, p0, color[1]); } - if (sx == 0 || sx == s->sw) + if ((sx == 0) || (sx == s->sw)) { uint16_t a; @@ -144,14 +144,14 @@ { p0 = color[1]; /* antialias the borders */ - if (sy == 0 || sy == s->sh) + if ((sy == 0) || (sy == s->sh)) { uint16_t a; a = 1 + ((syy & 0xffff) >> 8); p0 = INTERP_256(a, p0, color[0]); } - if (sx == 0 || sx == s->sw) + if ((sx == 0) || (sx == s->sw)) { uint16_t a; @@ -212,14 +212,14 @@ p0 = color[0]; /* antialias the borders */ - if (sy == 0 || sy == s->sh) + if ((sy == 0) || (sy == s->sh)) { uint16_t a; a = 1 + ((syy & 0xffff) >> 8); p0 = INTERP_256(a, p0, color[1]); } - if (sx == 0 || sx == s->sw) + if ((sx == 0) || (sx == s->sw)) { uint16_t a; @@ -231,14 +231,14 @@ { p0 = color[1]; /* antialias the borders */ - if (sy == 0 || sy == s->sh) + if ((sy == 0) || (sy == s->sh)) { uint16_t a; a = 1 + ((syy & 0xffff) >> 8); p0 = INTERP_256(a, p0, color[0]); } - if (sx == 0 || sx == s->sw) + if ((sx == 0) || (sx == s->sw)) { uint16_t a; Index: PROTO/enesim/src/lib/renderer/filter/dispmap.c =================================================================== --- PROTO/enesim/src/lib/renderer/filter/dispmap.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/filter/dispmap.c (working copy) @@ -100,7 +100,7 @@ uint16_t m0; uint16_t m1; - if (x < 0 || x >= mw || y < 0 || y >= mh) + if ((x < 0) || (x >= mw) || (y < 0) || (y >= mh)) goto next; xx = eina_f16p16_int_from(x); @@ -151,7 +151,7 @@ uint16_t m0; uint16_t m1; - if (x < 0 || x >= mw || y < 0 || y >= mh) + if ((x < 0) || (x >= mw) || (y < 0) || (y >= mh)) goto next; xx = eina_f16p16_int_from(x); @@ -206,7 +206,7 @@ x = eina_f16p16_int_to(xx); \ y = eina_f16p16_int_to(yy); \ \ - if (x < 0 || x >= mw || y < 0 || y >= mh) \ + if ((x < 0) || (x >= mw) || (y < 0) || (y >= mh)) \ goto next; \ \ m0 = *(map + (mstride * y) + x); \ Index: PROTO/enesim/src/lib/renderer/hswitch.c =================================================================== --- PROTO/enesim/src/lib/renderer/hswitch.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/hswitch.c (working copy) @@ -168,7 +168,7 @@ { Hswitch *h = (Hswitch *)r; - if (!h->lrend || !h->rrend) + if ((!h->lrend) || (!h->rrend)) return EINA_FALSE; if (!enesim_renderer_state_setup(h->lrend)) return EINA_FALSE; Index: PROTO/enesim/src/lib/renderer/shape/circle.c =================================================================== --- PROTO/enesim/src/lib/renderer/shape/circle.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/shape/circle.c (working copy) @@ -63,8 +63,8 @@ if (fpaint) fpaint->span(fpaint, x, y, len, dst); } - if ((circ->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && do_inner - && fpaint) + if ((circ->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && (do_inner) + && (fpaint)) fpaint->span(fpaint, x, y, len, dst); #if 0 @@ -84,7 +84,7 @@ unsigned int op0 = ocolor, p0; int a = 256; - if (fill_only && fpaint) + if ((fill_only) && (fpaint)) op0 = argb8888_mul4_sym(*d, op0); if (abs(xx) + abs(yy) >= rr0) @@ -107,7 +107,7 @@ op0 = argb8888_mul_256(a, op0); p0 = op0; - if (do_inner && (abs(xx) <= irr1) && (abs(yy) <= irr1)) + if ((do_inner) && (abs(xx) <= irr1) && (abs(yy) <= irr1)) { p0 = icolor; if (fpaint) @@ -151,7 +151,7 @@ float rad; float sw; - if (!circ || (circ->r < 1)) + if ((!circ) || (circ->r < 1)) return EINA_FALSE; circ->rr0 = 65536 * (circ->r - 1); Index: PROTO/enesim/src/lib/renderer/shape/figure.c =================================================================== --- PROTO/enesim/src/lib/renderer/shape/figure.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/shape/figure.c (working copy) @@ -226,7 +226,7 @@ p0 = MUL4_SYM(fcolor, p0); } - if (stroke && a) + if ((stroke) && (a)) { unsigned int q0 = p0; @@ -238,7 +238,7 @@ else if (a) { p0 = scolor; - if (fpaint && !stroke) + if ((fpaint) && (!stroke)) { p0 = *d; if (fcolor != 0xffffffff) @@ -400,7 +400,7 @@ p0 = MUL4_SYM(fcolor, p0); } - if (stroke && a) + if ((stroke) && (a)) { unsigned int q0 = p0; @@ -545,7 +545,7 @@ p0 = MUL4_SYM(fcolor, p0); } - if (stroke && a) + if ((stroke) && (a)) { unsigned int q0 = p0; @@ -577,7 +577,7 @@ Figure *o = (Figure *) p; Enesim_Renderer_Shape *f = (Enesim_Renderer_Shape *) p; - if (!f || !o) + if ((!f) || (!o)) return 0; if (!o->polys) return 0; @@ -592,7 +592,7 @@ poly = o->polys; while (poly) { - if (!poly->vertices || (poly->nverts < 3)) + if ((!poly->vertices) || (poly->nverts < 3)) return 0; nvectors += poly->nverts; if ((poly->last->v.x == poly->vertices->v.x) && @@ -670,7 +670,7 @@ o->changed = 0; } - if (f->fill.rend && + if ((f->fill.rend) && ((f->draw_mode == ENESIM_SHAPE_DRAW_MODE_FILL) || (f->draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL))) { @@ -706,7 +706,7 @@ (f->draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL))) enesim_renderer_state_cleanup(f->stroke.paint); */ - if (f->fill.rend && + if ((f->fill.rend) && ((f->draw_mode == ENESIM_SHAPE_DRAW_MODE_FILL) || (f->draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL))) enesim_renderer_state_cleanup(f->fill.rend); @@ -784,7 +784,7 @@ if (!o->polys) return; // maybe just add one instead poly = o->last; - if (poly->last && + if ((poly->last) && (fabs(poly->last->v.x - x) < (1 / 256.0)) && (fabs(poly->last->v.y - y) < (1 / 256.0))) return; Index: PROTO/enesim/src/lib/renderer/shape/rectangle.c =================================================================== --- PROTO/enesim/src/lib/renderer/shape/rectangle.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/shape/rectangle.c (working copy) @@ -329,7 +329,7 @@ if (fpaint) fpaint->span(fpaint, x, y, len, dst); } - if ((rect->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && do_inner && fpaint) + if ((rect->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && (do_inner) && (fpaint)) fpaint->span(fpaint, x, y, len, dst); #if 1 @@ -356,7 +356,7 @@ int lxx = xx - lxx0, rxx = xx - rxx0; int tyy = yy - tyy0, byy = yy - byy0; - if (fill_only && fpaint) + if ((fill_only) && (fpaint)) { ocolor = *d; if (icolor != 0xffffffff) @@ -468,7 +468,7 @@ do_inner = 0; if (fpaint) fpaint->span(fpaint, x, y, len, dst); } - if ((rect->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && do_inner && fpaint) + if ((rect->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && (do_inner) && (fpaint)) fpaint->span(fpaint, x, y, len, dst); #if 1 renderer_projective_setup(p, x, y, &xx, &yy, &zz); @@ -498,7 +498,7 @@ int lxx = sxx - lxx0, rxx = sxx - rxx0; int tyy = syy - tyy0, byy = syy - byy0; - if (fill_only && fpaint) + if ((fill_only) && (fpaint)) { ocolor = *d; if (icolor != 0xffffffff) @@ -583,7 +583,7 @@ { Rectangle *rect = (Rectangle *) p; - if (!rect || (rect->w < 1) || (rect->h < 1)) + if ((!rect) || (rect->w < 1) || (rect->h < 1)) return EINA_FALSE; if (1) @@ -617,7 +617,7 @@ rect->sw = sw; } - if (rect->base.fill.rend && + if ((rect->base.fill.rend) && ((rect->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_FILL) || (rect->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL))) { @@ -626,7 +626,7 @@ } p->span = ENESIM_RENDERER_SPAN_DRAW(_span_rounded_color_outlined_paint_filled_proj); - if (p->matrix.type == ENESIM_MATRIX_AFFINE || p->matrix.type == ENESIM_MATRIX_IDENTITY) + if ((p->matrix.type == ENESIM_MATRIX_AFFINE) || (p->matrix.type == ENESIM_MATRIX_IDENTITY)) p->span = ENESIM_RENDERER_SPAN_DRAW(_span_rounded_color_outlined_paint_filled_affine); p->changed = EINA_FALSE; @@ -637,7 +637,7 @@ { Rectangle *rect = (Rectangle *) p; - if (rect->base.fill.rend && + if ((rect->base.fill.rend) && ((rect->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_FILL) || (rect->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL))) enesim_renderer_state_cleanup(rect->base.fill.rend); Index: PROTO/enesim/src/lib/renderer/shape/path.c =================================================================== --- PROTO/enesim/src/lib/renderer/shape/path.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/shape/path.c (working copy) @@ -229,7 +229,7 @@ Path *o = (Path *) p; Enesim_Renderer_Shape *f = (Enesim_Renderer_Shape *) p; - if (!f || !o) + if ((!f) || (!o)) return 0; if (!o->figure) return 0; // should just not draw Index: PROTO/enesim/src/lib/renderer/shape/ellipse.c =================================================================== --- PROTO/enesim/src/lib/renderer/shape/ellipse.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/shape/ellipse.c (working copy) @@ -73,7 +73,7 @@ if (fpaint) fpaint->span(fpaint, x, y, len, dst); } - if ((ellipse->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && do_inner && fpaint) + if ((ellipse->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && (do_inner) && (fpaint)) fpaint->span(fpaint, x, y, len, dst); xx = (axx * x) + (axy * y) + axz; @@ -88,7 +88,7 @@ unsigned int op0 = ocolor, p0; int a = 256; - if (fill_only && fpaint) + if ((fill_only) && (fpaint)) { op0 = *d; if (ocolor != 0xffffffff) @@ -114,7 +114,7 @@ op0 = argb8888_mul_256(a, op0); p0 = op0; - if (do_inner && (abs(xx - xx0) <= irr1_x) && (abs(yy - yy0) + if ((do_inner) && (abs(xx - xx0) <= irr1_x) && (abs(yy - yy0) <= irr1_y)) { p0 = icolor; @@ -191,7 +191,7 @@ if (fpaint) fpaint->span(fpaint, x, y, len, dst); } - if ((ellipse->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && do_inner && fpaint) + if ((ellipse->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL) && (do_inner) && (fpaint)) fpaint->span(fpaint, x, y, len, dst); xx = (axx * x) + (axy * y) + axz; @@ -212,7 +212,7 @@ unsigned int op0 = ocolor, p0; int a = 256; - if (fill_only && fpaint) + if ((fill_only) && (fpaint)) { op0 = *d; if (ocolor != 0xffffffff) @@ -236,7 +236,7 @@ op0 = argb8888_mul_256(a, op0); p0 = op0; - if (do_inner && (abs(sxx - xx0) <= irr1_x) && (abs(syy - yy0) <= irr1_y)) + if ((do_inner) && (abs(sxx - xx0) <= irr1_x) && (abs(syy - yy0) <= irr1_y)) { p0 = icolor; if (fpaint) @@ -279,7 +279,7 @@ float rx, ry; float sw; - if (!ellipse || (ellipse->rx < 1) || (ellipse->ry < 1)) + if ((!ellipse) || (ellipse->rx < 1) || (ellipse->ry < 1)) return EINA_FALSE; if (1) @@ -331,7 +331,7 @@ } } - if (ellipse->base.fill.rend && + if ((ellipse->base.fill.rend) && ((ellipse->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_FILL) || (ellipse->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL))) { @@ -340,7 +340,7 @@ } p->span = ENESIM_RENDERER_SPAN_DRAW(_span_color_outlined_paint_filled_proj); - if (p->matrix.type == ENESIM_MATRIX_AFFINE || p->matrix.type == ENESIM_MATRIX_IDENTITY) + if ((p->matrix.type == ENESIM_MATRIX_AFFINE) || (p->matrix.type == ENESIM_MATRIX_IDENTITY)) p->span = ENESIM_RENDERER_SPAN_DRAW(_span_color_outlined_paint_filled_affine); p->changed = EINA_FALSE; @@ -351,7 +351,7 @@ { Ellipse *ellipse = (Ellipse *) p; - if (ellipse->base.fill.rend && + if ((ellipse->base.fill.rend) && ((ellipse->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_FILL) || (ellipse->base.draw_mode == ENESIM_SHAPE_DRAW_MODE_STROKE_FILL))) enesim_renderer_state_cleanup(ellipse->base.fill.rend); Index: PROTO/enesim/src/lib/renderer/surface.c =================================================================== --- PROTO/enesim/src/lib/renderer/surface.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/surface.c (working copy) @@ -112,7 +112,7 @@ y -= r->oy; x -= r->ox; - if (y < 0 || y >= s->h) + if ((y < 0) || (y >= s->h)) { while (len--) *dst++ = 0; @@ -125,7 +125,7 @@ while (len--) { - if (x >= 0 && x < s->w) + if ((x >= 0) && (x < s->w)) *dst = *(src + s->xoff[x]); else *dst = 0; @@ -158,7 +158,7 @@ x = eina_f16p16_int_to(xx); y = eina_f16p16_int_to(yy); - if (x >= 0 && x < s->w && y >= 0 && y < s->h) + if ((x >= 0) && (x < s->w) && (y >= 0) && (y < s->h)) { sy = s->yoff[y]; sx = s->xoff[x]; @@ -178,7 +178,7 @@ uint32_t sstride; uint32_t *src; - if (y < r->oy || y > r->oy + s->w) + if ((y < r->oy) || (y > r->oy + s->w)) { while (len--) *dst++ = 0; @@ -191,7 +191,7 @@ src += sstride * (y - r->oy) + x; while (len--) { - if (x >= r->ox && x < r->ox + s->w) + if ((x >= r->ox) && (x < r->ox + s->w)) *dst = *src; else *dst = 0; @@ -222,7 +222,7 @@ int sw, sh; Surface *s = (Surface *)r; - if (s->w < 1 || s->h < 1) + if ((s->w < 1) || (s->h < 1)) return EINA_FALSE; if (!s->s) @@ -233,7 +233,7 @@ return EINA_FALSE; enesim_surface_size_get(s->s, &sw, &sh); - if (sw != s->w && sh != s->h) + if ((sw != s->w) && (sh != s->h)) { s->xoff = malloc(sizeof(int) * s->w); s->yoff = malloc(sizeof(int) * s->h); Index: PROTO/enesim/src/lib/renderer/transition.c =================================================================== --- PROTO/enesim/src/lib/renderer/transition.c (revision 51690) +++ PROTO/enesim/src/lib/renderer/transition.c (working copy) @@ -70,7 +70,7 @@ { Transition *t = (Transition *)r; - if (!t || !t->r0.rend || !t->r1.rend) + if ((!t) || (!t->r0.rend) || (!t->r1.rend)) return EINA_FALSE; /* compound the matrices of the transition renderer and each Index: PROTO/enesim/src/lib/util/enesim_matrix.c =================================================================== --- PROTO/enesim/src/lib/util/enesim_matrix.c (revision 51690) +++ PROTO/enesim/src/lib/util/enesim_matrix.c (working copy) @@ -172,7 +172,7 @@ */ EAPI void enesim_matrix_point_transform(Enesim_Matrix *m, float x, float y, float *xr, float *yr) { - if (!MATRIX_ZX(m) && !MATRIX_ZY(m)) + if ((!MATRIX_ZX(m)) && (!MATRIX_ZY(m))) { if (xr) *xr = (x * MATRIX_XX(m) + y * MATRIX_XY(m) + MATRIX_XZ(m)); @@ -545,7 +545,7 @@ float ey = QUAD_Y0(q) - QUAD_Y1(q) + QUAD_Y2(q) - QUAD_Y3(q); // y0 - y1 + y2 - y3 /* paralellogram */ - if (!ex && !ey) + if ((!ex) && (!ey)) { /* create the affine matrix */ MATRIX_XX(m) = QUAD_X1(q) - QUAD_X0(q); Index: PROTO/image-viewer/src/bin/main.c =================================================================== --- PROTO/image-viewer/src/bin/main.c (revision 51690) +++ PROTO/image-viewer/src/bin/main.c (working copy) @@ -168,7 +168,7 @@ static void image_configure(IV *iv) { - if (!iv->gui.image_size.w || !iv->gui.image_size.h) + if ((!iv->gui.image_size.w) || (!iv->gui.image_size.h)) { elm_image_scale_set(iv->gui.img, EINA_FALSE, EINA_FALSE); evas_object_size_hint_max_get(iv->gui.img, &(iv->gui.image_size.w), &(iv->gui.image_size.h)); @@ -228,7 +228,7 @@ static void remove_iv_file(IV *iv, IV_File *file, Eina_Bool set_current) { - if (iv->account->current == file && set_current) + if ((iv->account->current == file) && (set_current)) { if (IV_FILE_NEXT(file)) iv->account->current = IV_FILE_NEXT(file); @@ -389,7 +389,7 @@ IV *iv = data; Evas_Event_Mouse_Down *ev = event_info; - if (iv->config->fit == PAN || iv->config->fit == ZOOM) + if ((iv->config->fit == PAN) || (iv->config->fit == ZOOM)) return; if (ev->button == 3) @@ -507,7 +507,7 @@ else iv->config->img_scale = iv->config->img_scale / 1.1; - if (iv->config->img_scale > 0.97 && iv->config->img_scale < 1.04) + if ((iv->config->img_scale > 0.97) && (iv->config->img_scale < 1.04)) iv->config->img_scale = 1.0; else if (iv->config->img_scale < 0.01) iv->config->img_scale = 0.01; @@ -784,7 +784,7 @@ { IV *iv = data; - if (iv->gui.preview_win && (!evas_object_visible_get(iv->gui.preview_win))) + if ((iv->gui.preview_win) && (!evas_object_visible_get(iv->gui.preview_win))) toggle_previews(iv); } #endif @@ -814,7 +814,7 @@ #ifdef HAVE_ETHUMB if (file->thumb_path) thumb_remove(file); - if (!eina_list_data_find_list(iv->preview_files, file) && !file->flags.thumb_generating) + if ((!eina_list_data_find_list(iv->preview_files, file)) && (!file->flags.thumb_generating)) { if (IV_FILE_NEXT(file)) file->insert_before = IV_FILE_NEXT(file); @@ -887,7 +887,7 @@ break; } - if (!iv->idler && iv->flags.current) + if ((!iv->idler) && (iv->flags.current)) iv->idler = ecore_idler_add(on_idler, iv); } @@ -949,7 +949,7 @@ exif_data_free(exif); } #endif - if (orientation > 1 && orientation < 9) + if ((orientation > 1) && (orientation < 9)) { Elm_Image_Orient t1 = ELM_IMAGE_ORIENT_NONE; @@ -1103,7 +1103,7 @@ IV_File *new = create_iv_file(iv, buf); iv->files = eina_inlist_append(iv->files, EINA_INLIST_GET(new)); - if (iv->single_file && iv->single_file == new->file_path) + if ((iv->single_file) && (iv->single_file == new->file_path)) { iv->account->current = new; iv->single_file = NULL; @@ -1118,7 +1118,7 @@ iv->file_monitors, ecore_file_monitor_add(buf2, on_file_monitor_event, iv)); - if (!renew && iv->dirs) + if ((!renew) && (iv->dirs)) renew = EINA_TRUE; if (!iv->account->current) iv->account->current = IV_FILE(iv->files); @@ -1131,8 +1131,8 @@ read_image(iv, IMAGE_CURRENT); else { - if (IV_FILE_NEXT(iv->account->current) || - IV_FILE_PREV(iv->account->current)) + if ((IV_FILE_NEXT(iv->account->current)) || + (IV_FILE_PREV(iv->account->current))) { if (!iv->gui.prev_img) { @@ -1155,9 +1155,9 @@ } #ifdef HAVE_ETHUMB - if (iv->preview_files && iv->connection_retry) + if ((iv->preview_files) && (iv->connection_retry)) { - if (iv->ethumb_client && iv->flags.ethumb_connection) + if ((iv->ethumb_client) && (iv->flags.ethumb_connection)) thumb_queue_process(iv); else if (!iv->ethumb_client) iv->ethumb_client = ethumb_client_connect(on_thumb_connect, iv, NULL); @@ -1166,10 +1166,10 @@ } } - if (!renew && iv->account->current && - (!iv->gui.img || ((IV_FILE_PREV(iv->account->current) || - IV_FILE_NEXT(iv->account->current)) && - (!iv->gui.prev_img || !iv->gui.next_img)))) + if ((!renew) && (iv->account->current) && + ((!iv->gui.img) || (((IV_FILE_PREV(iv->account->current)) || + (IV_FILE_NEXT(iv->account->current))) && + (((((((((((((((((((((((((((((((!iv->gui.prev_img)))))))))))))))))))))))))))))) || (!iv->gui.next_img))))) renew = EINA_TRUE; if (iv->flags.next) @@ -1531,12 +1531,12 @@ IV *iv = data; Evas_Event_Key_Down *ev = event_info; - if (!iv || !ev) return; - if (!strcmp(ev->keyname, "space") || !strcmp(ev->keyname, "Right")) + if ((!iv) || (!ev)) return; + if ((!strcmp(ev->keyname, "space")) || (!strcmp(ev->keyname, "Right"))) iv->flags.next = EINA_TRUE; else if (!strcmp(ev->keyname, "Left")) iv->flags.prev = EINA_TRUE; - else if (!strcmp(ev->keyname, "q") || ((!strcmp(ev->keyname, "Escape") && !iv->flags.fullscreen && !iv->flags.slideshow))) + else if ((!strcmp(ev->keyname, "q")) || (((!strcmp(ev->keyname, "Escape")) && (!iv->flags.fullscreen) && (!iv->flags.slideshow)))) iv_exit(iv); else if (!strcmp(ev->keyname, "equal")) zoom_set(iv, EINA_TRUE); @@ -1582,18 +1582,18 @@ if (iv->flags.fullscreen) { - if (!strcmp(ev->keyname, "F11") || !strcmp(ev->keyname, "Escape") || !strcmp(ev->keyname, "f")) + if ((!strcmp(ev->keyname, "F11")) || (!strcmp(ev->keyname, "Escape")) || (!strcmp(ev->keyname, "f"))) unfullscreen(iv); } else { - if (!strcmp(ev->keyname, "F11") || !strcmp(ev->keyname, "f")) + if ((!strcmp(ev->keyname, "F11")) || (!strcmp(ev->keyname, "f"))) fullscreen(iv); } if (iv->flags.slideshow) { - if (!strcmp(ev->keyname, "F5") || !strcmp(ev->keyname, "Escape")) + if ((!strcmp(ev->keyname, "F5")) || (!strcmp(ev->keyname, "Escape"))) slideshow_off(iv); } else Index: PROTO/eon/src/lib/shape/eon_rect.c =================================================================== --- PROTO/eon/src/lib/shape/eon_rect.c (revision 51690) +++ PROTO/eon/src/lib/shape/eon_rect.c (working copy) @@ -71,9 +71,9 @@ sw = eon_shape_stroke_width_get(s); - if (x > (cx.final + sw) && (x < cx.final + cw.final - sw) && - y > (cy.final + sw) && - y < (cy.final + ch.final + sw)) + if ((x > (cx.final + sw)) && (x < cx.final + cw.final - sw) && + (y > (cy.final + sw)) && + (y < (cy.final + ch.final + sw))) return EINA_FALSE; else return EINA_TRUE; Index: PROTO/eon/src/lib/shape/eon_circle.c =================================================================== --- PROTO/eon/src/lib/shape/eon_circle.c (revision 51690) +++ PROTO/eon/src/lib/shape/eon_circle.c (working copy) @@ -149,7 +149,7 @@ r3 = prv->radius - sw; r3 *= r3; - if (x2 + y2 <= r2 && x2 + y2 >= r3) + if ((x2 + y2 <= r2) && (x2 + y2 >= r3)) return EINA_TRUE; else return EINA_FALSE; Index: PROTO/eon/src/lib/script/neko/neko_main.c =================================================================== --- PROTO/eon/src/lib/script/neko/neko_main.c (revision 51690) +++ PROTO/eon/src/lib/script/neko/neko_main.c (working copy) @@ -79,7 +79,7 @@ f = val_field(en->module, val_id(fname)); /* FIXME the function should have three arguments? */ - if (!val_is_function(f) || val_fun_nargs(f) != 0) + if ((!val_is_function(f)) || (val_fun_nargs(f) != 0)) return EINA_FALSE; /* for now just instantiate an object from dis */ @@ -89,7 +89,7 @@ obj = alloc_abstract(k_object, dis); // setup the proto on the object proto = val_field(en->ekeko, val_id("object_external")); - if (!val_is_function(proto) || val_fun_nargs(proto) != 1) + if ((!val_is_function(proto)) || (val_fun_nargs(proto) != 1)) return EINA_FALSE; nobj = val_call1(proto, obj); Index: PROTO/eon/src/lib/core/eon_paint.c =================================================================== --- PROTO/eon/src/lib/core/eon_paint.c (revision 51690) +++ PROTO/eon/src/lib/core/eon_paint.c (working copy) @@ -170,7 +170,7 @@ if (!last) last = _prev_renderable_up(o); /* no parent with a renderable below */ - if (!last || last == p) + if ((!last) || (last == p)) { /* first element */ /* Set the zindex */ @@ -391,14 +391,14 @@ prv->boundings.curr = r; } /* check that the geometry have changed */ - if (eina_rectangle_equals(&prv->geometry.curr, &prv->geometry.prev) - && prv->geometry.changed) + if ((eina_rectangle_equals(&prv->geometry.curr, &prv->geometry.prev)) + && (prv->geometry.changed)) { prv->geometry.changed = EINA_FALSE; eon_paint_unchange(p); } - else if (!eina_rectangle_equals(&prv->geometry.curr, &prv->geometry.prev) - && !prv->geometry.changed) + else if ((!eina_rectangle_equals(&prv->geometry.curr, &prv->geometry.prev)) + && (!prv->geometry.changed)) { prv->geometry.changed = EINA_TRUE; eon_paint_change(p); @@ -409,14 +409,14 @@ (Ekeko_Object *)p, EINA_FALSE); ekeko_object_event_dispatch((Ekeko_Object *)p, (Ekeko_Event *)&gch); /* check that the boundings have changed */ - if (eina_rectangle_equals(&prv->boundings.curr, &prv->geometry.prev) - && prv->boundings.changed) + if ((eina_rectangle_equals(&prv->boundings.curr, &prv->geometry.prev)) + && (prv->boundings.changed)) { prv->boundings.changed = EINA_FALSE; eon_paint_unchange(p); } - else if (!eina_rectangle_equals(&prv->boundings.curr, &prv->geometry.prev) - && !prv->boundings.changed) + else if ((!eina_rectangle_equals(&prv->boundings.curr, &prv->geometry.prev)) + && (!prv->boundings.changed)) { prv->boundings.changed = EINA_TRUE; eon_paint_change(p); Index: PROTO/eon/src/lib/core/eon_layout.c =================================================================== --- PROTO/eon/src/lib/core/eon_layout.c (revision 51690) +++ PROTO/eon/src/lib/core/eon_layout.c (working copy) @@ -296,7 +296,7 @@ int w; parent = ekeko_object_parent_get(o); - if (!parent || !ekeko_type_instance_is_of(parent, EON_TYPE_DOCUMENT)) + if ((!parent) || (!ekeko_type_instance_is_of(parent, EON_TYPE_DOCUMENT))) return; prv = PRIVATE(o); @@ -320,7 +320,7 @@ int h; parent = ekeko_object_parent_get(o); - if (!parent || !ekeko_type_instance_is_of(parent, EON_TYPE_DOCUMENT)) + if ((!parent) || (!ekeko_type_instance_is_of(parent, EON_TYPE_DOCUMENT))) return; prv = PRIVATE(o); @@ -344,7 +344,7 @@ int w; parent = ekeko_object_parent_get(o); - if (!parent || !ekeko_type_instance_is_of(parent, EON_TYPE_DOCUMENT)) + if ((!parent) || (!ekeko_type_instance_is_of(parent, EON_TYPE_DOCUMENT))) return; prv = PRIVATE(o); @@ -368,7 +368,7 @@ int h; parent = ekeko_object_parent_get(o); - if (!parent || !ekeko_type_instance_is_of(parent, EON_TYPE_DOCUMENT)) + if ((!parent) || (!ekeko_type_instance_is_of(parent, EON_TYPE_DOCUMENT))) return; prv = PRIVATE(o); Index: PROTO/eon/src/lib/core/eon_document.c =================================================================== --- PROTO/eon/src/lib/core/eon_document.c (revision 51690) +++ PROTO/eon/src/lib/core/eon_document.c (working copy) @@ -96,9 +96,9 @@ Eon_Document *d = (Eon_Document *)o; Eon_Document_Private *prv = PRIVATE(d); - if (!prv->layout && ekeko_type_instance_is_of(em->related, EON_TYPE_LAYOUT)) + if ((!prv->layout) && (ekeko_type_instance_is_of(em->related, EON_TYPE_LAYOUT))) prv->layout = (Eon_Layout *)em->related; - else if (!prv->style && ekeko_type_instance_is_of(em->related, EON_TYPE_STYLE)) + else if ((!prv->style) && (ekeko_type_instance_is_of(em->related, EON_TYPE_STYLE))) prv->style = (Eon_Style *)em->related; } @@ -151,9 +151,9 @@ (!ekeko_type_instance_is_of(child, EON_TYPE_STYLE))) return EINA_FALSE; /* we should use the childs list instead as we might have more than one canvas */ - if (prv->layout && ekeko_type_instance_is_of(child, EON_TYPE_LAYOUT)) + if ((prv->layout) && (ekeko_type_instance_is_of(child, EON_TYPE_LAYOUT))) return EINA_FALSE; - if (prv->style && ekeko_type_instance_is_of(child, EON_TYPE_STYLE)) + if ((prv->style) && (ekeko_type_instance_is_of(child, EON_TYPE_STYLE))) return EINA_FALSE; return EINA_TRUE; @@ -228,7 +228,7 @@ { Eon_Document_Private *prv = PRIVATE(d); - if (!prv->vm.sm || !prv->vm.sm->execute) + if ((!prv->vm.sm) || (!prv->vm.sm->execute)) return; prv->vm.sm->execute(prv->vm.data, fname, o); } Index: PROTO/eon/src/lib/core/eon_animation.c =================================================================== --- PROTO/eon/src/lib/core/eon_animation.c (revision 51690) +++ PROTO/eon/src/lib/core/eon_animation.c (working copy) @@ -45,7 +45,7 @@ do { o = ekeko_object_parent_get(o); - } while (o && !ekeko_type_instance_is_of(o, EON_TYPE_DOCUMENT)); + } while ((o) && (!ekeko_type_instance_is_of(o, EON_TYPE_DOCUMENT))); return (Eon_Document *)o; } Index: PROTO/eon/src/lib/parser/exml/exml_main.c =================================================================== --- PROTO/eon/src/lib/parser/exml/exml_main.c (revision 51690) +++ PROTO/eon/src/lib/parser/exml/exml_main.c (working copy) @@ -312,7 +312,7 @@ case EKEKO_PROPERTY_STRING: { /* FIXME remove "Eon_Image" */ - if (ekeko_type_instance_is_of(o, "Eon_Image") && !strcmp(attr, "file")) + if ((ekeko_type_instance_is_of(o, "Eon_Image")) && (!strcmp(attr, "file"))) { char real_file[256]; @@ -489,7 +489,7 @@ } eon_parser_polygon_points_str_from(o, value); } - else if (!strcmp(tag, "anim") || !strcmp(tag, "animMatrix")) + else if ((!strcmp(tag, "anim")) || (!strcmp(tag, "animMatrix"))) { char *value; @@ -564,7 +564,7 @@ } n = exml_get(exml); /* FIXME we should actually compare the name with the type name */ - if (!n || strcmp(n->tag, "eon")) + if ((!n) || (strcmp(n->tag, "eon"))) { printf("no eon file\n"); return EINA_FALSE; Index: PROTO/eon/src/engines/enesim/enesim_engine.c =================================================================== --- PROTO/eon/src/engines/enesim/enesim_engine.c (revision 51690) +++ PROTO/eon/src/engines/enesim/enesim_engine.c (working copy) @@ -512,10 +512,10 @@ w = eon_buffer_data_width_get(eb); h = eon_buffer_data_height_get(eb); - if (w == 0 || h == 0) + if ((w == 0) || (h == 0)) return; - if (w != iw || h != ih) + if ((w != iw) || (h != ih)) { if (b->s) enesim_surface_delete(b->s); Index: PROTO/etch/src/lib/etch_time.c =================================================================== --- PROTO/etch/src/lib/etch_time.c (revision 51690) +++ PROTO/etch/src/lib/etch_time.c (working copy) @@ -64,7 +64,7 @@ { if (l->secs > r->secs) return EINA_TRUE; - else if (l->secs == r->secs && l->usecs >= r->usecs) + else if ((l->secs == r->secs) && (l->usecs >= r->usecs)) return EINA_TRUE; else return EINA_FALSE; @@ -74,7 +74,7 @@ { if (l->secs < r->secs) return EINA_TRUE; - else if (l->secs == r->secs && l->usecs <= r->usecs) + else if ((l->secs == r->secs) && (l->usecs <= r->usecs)) return EINA_TRUE; else return EINA_FALSE; Index: PROTO/elsa/src/bin/elsa_pam.c =================================================================== --- PROTO/elsa/src/bin/elsa_pam.c (revision 51690) +++ PROTO/elsa/src/bin/elsa_pam.c (working copy) @@ -169,8 +169,8 @@ elsa_pam_init(const char *service, const char *display) { int status; - if (!service && !*service) goto pam_error; - if (!display && !*display) goto pam_error; + if ((!service) && (!*service)) goto pam_error; + if ((!display) && (!*display)) goto pam_error; _pam_handle = NULL; _pam_conversation.conv = _elsa_pam_conv; @@ -224,7 +224,7 @@ int elsa_pam_env_set(const char *env, const char *value) { char buf[1024]; - if (!env || !value) return 1; + if ((!env) || (!value)) return 1; snprintf(buf, sizeof(buf), "%s=%s", env, value); last_result = pam_putenv(_pam_handle, buf); switch (last_result) { Index: PROTO/elsa/src/bin/elsa.c =================================================================== --- PROTO/elsa/src/bin/elsa.c (revision 51690) +++ PROTO/elsa/src/bin/elsa.c (working copy) @@ -176,7 +176,7 @@ } } - if(getuid() != 0 && !_testing) + if((getuid() != 0) && (!_testing)) { fprintf(stderr, "Only root can run this program\n"); return 1; Index: PROTO/elsa/src/bin/elsa_session.c =================================================================== --- PROTO/elsa/src/bin/elsa_session.c (revision 51690) +++ PROTO/elsa/src/bin/elsa_session.c (working copy) @@ -35,7 +35,7 @@ { char buf[PATH_MAX]; FILE *cmd; - if (!xauth_cmd || !auth_file) return 1; + if ((!xauth_cmd) || (!auth_file)) return 1; snprintf(buf, sizeof(buf), "%s -f %s -q", xauth_cmd, auth_file); fprintf(stderr, PACKAGE": write auth %s\n", buf); Index: PROTO/elsa/src/bin/elsa_gui.c =================================================================== --- PROTO/elsa/src/bin/elsa_gui.c (revision 51690) +++ PROTO/elsa/src/bin/elsa_gui.c (working copy) @@ -81,9 +81,9 @@ char *h, *s; h = elsa_gui_user_get(); s = elsa_gui_password_get(); - if (h && s) + if ((h) && (s)) { - if (strcmp(h, "") && strcmp(s, "")) + if ((strcmp(h, "")) && (strcmp(s, ""))) { free(h); free(s); @@ -179,7 +179,7 @@ free(tmp); printf("desktop command %s\n", command); } - if (command && desktop->name) + if ((command) && (desktop->name)) { xsession = calloc(1, sizeof(Elsa_Xsession)); xsession->command = eina_stringshare_add(command); @@ -263,7 +263,7 @@ #ifdef XNEST_DEBUG char *tmp = getenv("DISPLAY"); - if (tmp && *tmp) + if ((tmp) && (*tmp)) { fprintf(stderr, PACKAGE": Using display name %s", tmp); } Index: PROTO/enterminus/src/bin/handlers.c =================================================================== --- PROTO/enterminus/src/bin/handlers.c (revision 51690) +++ PROTO/enterminus/src/bin/handlers.c (working copy) @@ -14,7 +14,7 @@ c = c2->car[0];/* FIXME we'll wrap c for now, the code will be reworked*/ else c = 0; - for (len = 0; c != '\007' && len < 512; len++) { + for (len = 0; (c != '\007') && (len < 512); len++) { buf[len] = c; if((c2 = term_tcanvas_data_pop(term))) c = c2->car[0];/* FIXME we'll wrap c for now, the code will be reworked*/ @@ -63,7 +63,7 @@ c = c2->car[0]; else c = 0; - while (isdigit(c) || c == ';' || c == '?') { + while ((isdigit(c)) || (c == ';') || (c == '?')) { if (c == ';') { args[narg] = 0; digit = 0; @@ -382,10 +382,10 @@ else if (args[i] == 27) { //set_buffer_reverse(0); } - else if (args[i] >= 30 && args[i] <= 37) { + else if ((args[i] >= 30) && (args[i] <= 37)) { term_tcanvas_fg_color_set(term, args[i] - 30); } - else if (args[i] >= 40 && args[i] <= 47) { + else if ((args[i] >= 40) && (args[i] <= 47)) { term_tcanvas_bg_color_set(term, args[i] - 40); } else if (args[i] == 39) { @@ -482,7 +482,7 @@ else c = 0; } - if (c != ';' || !narg) { + if ((c != ';') || (!narg)) { DPRINT((stderr, "Invalid xterm sequence\n")); break; } @@ -636,13 +636,13 @@ term_entry_right_delete(evas_object_smart_data_get(data)); else #endif - if (!strcmp(ev->keyname, "Return") || - !strcmp(ev->keyname, "KP_Return") || - !strcmp(ev->keyname, "Enter") || - !strcmp(ev->keyname, "KP_Enter")) { + if ((!strcmp(ev->keyname, "Return")) || + (!strcmp(ev->keyname, "KP_Return")) || + (!strcmp(ev->keyname, "Enter")) || + (!strcmp(ev->keyname, "KP_Enter"))) { } - else if ((ev->keyname && strlen(ev->keyname) == 1) || - !strcmp(keyname, " ")) { + else if (((ev->keyname) && (strlen(ev->keyname) == 1)) || + (!strcmp(keyname, " "))) { //char *tmp = ev->string; //term_key_down(evas_object_smart_data_get(data),tmp[0]); //write(term->cmd_fd.sys, tmp, 1); Index: PROTO/enterminus/src/bin/term.c =================================================================== --- PROTO/enterminus/src/bin/term.c (revision 51690) +++ PROTO/enterminus/src/bin/term.c (working copy) @@ -111,8 +111,8 @@ else if ((d & 0xf0) == 0xe0) { /* 3 bytes */ - if (((d2 = term->data[term->data_ptr++]) & 0xc0) != 0x80 || - ((d3 = term->data[term->data_ptr++]) & 0xc0) != 0x80) + if ((((d2 = term->data[term->data_ptr++]) & 0xc0) != 0x80) || + (((d3 = term->data[term->data_ptr++]) & 0xc0) != 0x80)) return NULL; ret->nbchar = 3; ret->car[0] = d; @@ -122,9 +122,9 @@ else { /* 4 bytes */ - if (((d2 = term->data[term->data_ptr++]) & 0xc0) != 0x80 || - ((d3 = term->data[term->data_ptr++]) & 0xc0) != 0x80 || - ((d4 = term->data[term->data_ptr++]) & 0xc0) != 0x80) + if ((((d2 = term->data[term->data_ptr++]) & 0xc0) != 0x80) || + (((d3 = term->data[term->data_ptr++]) & 0xc0) != 0x80) || + (((d4 = term->data[term->data_ptr++]) & 0xc0) != 0x80)) return NULL; ret->nbchar = 3; ret->car[0] = d; @@ -248,7 +248,7 @@ canvas->pos = 0; - if (!canvas->grid || !canvas->changed_rows) { + if ((!canvas->grid) || (!canvas->changed_rows)) { fprintf(stderr, "Could not allocate memory for grid!"); exit(-1); } Index: PROTO/enterminus/src/bin/pty.c =================================================================== --- PROTO/enterminus/src/bin/pty.c (revision 51690) +++ PROTO/enterminus/src/bin/pty.c (working copy) @@ -18,7 +18,7 @@ if((fd = getpt()) >= 0) { - if(grantpt(fd) == 0 && unlockpt(fd) == 0) + if((grantpt(fd) == 0) && (unlockpt(fd) == 0)) { ptydev = ptsname(fd); if((term->slave.sys = open(ptydev, O_RDWR | O_NOCTTY)) < 0) Index: PROTO/evil/src/lib/evil_stdio.c =================================================================== --- PROTO/evil/src/lib/evil_stdio.c (revision 51690) +++ PROTO/evil/src/lib/evil_stdio.c (working copy) @@ -31,7 +31,7 @@ char *filename; char *tmp; - if (!path || !*path) + if ((!path) || (!*path)) return NULL; if ((*path != '\\') && (*path != '/')) @@ -113,7 +113,7 @@ DWORD acs = GENERIC_READ; DWORD creation; - if (!path || !*path || !mode || !*mode) + if ((!path) || (!*path) || (!mode) || (!*mode)) return NULL; if ((*path != '\\') && (*path != '/')) Index: PROTO/evil/src/lib/evil_mman.c =================================================================== --- PROTO/evil/src/lib/evil_mman.c (revision 51690) +++ PROTO/evil/src/lib/evil_mman.c (working copy) @@ -201,7 +201,7 @@ if ((os_version.dwPlatformId == VER_PLATFORM_WIN32_CE) && (os_version.dwMajorVersion < 5)) { - if (addr && (addr != MAP_FAILED)) + if ((addr) && (addr != MAP_FAILED)) free(addr); return 0; Index: PROTO/evil/src/lib/evil_fnmatch.c =================================================================== --- PROTO/evil/src/lib/evil_fnmatch.c (revision 51690) +++ PROTO/evil/src/lib/evil_fnmatch.c (working copy) @@ -26,9 +26,9 @@ *status = fnmatch_syntax_error; return 0; } - else if (class_token[1] == '-' && class_token[2] != ']') + else if ((class_token[1] == '-') && (class_token[2] != ']')) { - if (class_token[0] <= c && c <= class_token[2]) + if ((class_token[0] <= c) && (c <= class_token[2])) *status = fnmatch_found; return 3; } @@ -74,9 +74,9 @@ do pos += fnmatch_match_class_token(&status, class + pos, c); - while (class[pos] && class[pos] != ']'); + while ((class[pos]) && (class[pos] != ']')); - if (status == fnmatch_syntax_error || ! class[pos]) + if ((status == fnmatch_syntax_error) || (! class[pos])) return FNM_SYNTAXERR; if (status == fnmatch_found) @@ -90,9 +90,9 @@ fnmatch_chrcasecmp(char a, char b) { - if ('A' <= a && a <= 'Z') + if (('A' <= a) && (a <= 'Z')) a += 'a' - 'A'; - if ('A' <= b && b <= 'Z') + if (('A' <= b) && (b <= 'Z')) b += 'a' - 'A'; return a == b; } @@ -104,13 +104,13 @@ e_bool leading, int flags) { - if (*token == '\\' && !(flags & FNM_NOESCAPE)) + if ((*token == '\\') && (!(flags & FNM_NOESCAPE))) return token[1] ? (token[1] == c ? 2 : 0) : FNM_SYNTAXERR; - if (c == '/' && (flags & FNM_PATHNAME)) + if ((c == '/') && (flags & FNM_PATHNAME)) return *token == '/'; - if (c == '.' && leading && (flags & FNM_PERIOD)) + if ((c == '.') && (leading) && (flags & FNM_PERIOD)) return *token == '.'; switch (*token) @@ -183,7 +183,7 @@ fnmatch_init_states(states); - for (c = (char *)string; *c && states->size; ++c) + for (c = (char *)string; (*c) && (states->size); ++c) { size_t i; fnmatch_list_of_states_clear(new_states); @@ -194,15 +194,15 @@ if (! pattern[pos]) { - if (*c == '/' && (flags & FNM_LEADING_DIR)) + if ((*c == '/') && (flags & FNM_LEADING_DIR)) return 0; continue; } else if (pattern[pos] == '*') { fnmatch_list_of_states_insert(states, pos + 1); - if ((*c != '/' || !(flags & FNM_PATHNAME)) && - (*c != '.' || !leading || !(flags & FNM_PERIOD))) + if (((*c != '/') || (!(flags & FNM_PATHNAME))) && + ((*c != '.') || (!leading) || (!(flags & FNM_PERIOD)))) fnmatch_list_of_states_insert(new_states, pos); } else @@ -222,7 +222,7 @@ states = new_states; new_states = tmp; } - leading = *c == '/' && (flags & FNM_PATHNAME); + leading = (*c == '/') && (flags & FNM_PATHNAME); } r = fnmatch_check_finals(pattern, states); Index: PROTO/evil/src/lib/evil_stdlib.c =================================================================== --- PROTO/evil/src/lib/evil_stdlib.c (revision 51690) +++ PROTO/evil/src/lib/evil_stdlib.c (working copy) @@ -40,7 +40,7 @@ DWORD disposition; DWORD size = PATH_MAX; - if (!name || !*name) + if ((!name) || (!*name)) return NULL; if ((res = RegCreateKeyEx(HKEY_LOCAL_MACHINE, @@ -133,7 +133,7 @@ size_t length; int res; - if (!name || !*name) + if ((!name) || (!*name)) return -1; /* if '=' is found, return EINVAL */ @@ -147,7 +147,7 @@ /* if name is already set and overwrite is 0, we exit with success */ old_name = getenv(name); - if (!overwrite && old_name) + if ((!overwrite) && (old_name)) return 0; length = value ? strlen(value) : 0; @@ -178,7 +178,7 @@ char *data; DWORD size; - if (!name || !*name) + if ((!name) || (!*name)) return -1; /* if '=' is found, return an error */ @@ -198,7 +198,7 @@ } /* if name is already set and overwrite is 0, we exit with success */ - if (!overwrite && (disposition == REG_OPENED_EXISTING_KEY)) + if ((!overwrite) && (disposition == REG_OPENED_EXISTING_KEY)) return 0; wname = evil_char_to_wchar(name); @@ -361,7 +361,7 @@ size_t l2; size_t l; - if (!file_name || !resolved_name) + if ((!file_name) || (!resolved_name)) return NULL; if (!getcwd(cwd, PATH_MAX)) Index: PROTO/evil/src/lib/evil_dirent.c =================================================================== --- PROTO/evil/src/lib/evil_dirent.c (revision 51690) +++ PROTO/evil/src/lib/evil_dirent.c (working copy) @@ -32,7 +32,7 @@ #endif /* valid name */ - if (!name || !*name) + if ((!name) || (!*name)) { #ifdef HAVE_ERRNO_H errno = ENOENT; Index: PROTO/evil/src/lib/evil_libgen.c =================================================================== --- PROTO/evil/src/lib/evil_libgen.c (revision 51690) +++ PROTO/evil/src/lib/evil_libgen.c (working copy) @@ -15,7 +15,7 @@ char *p2; size_t length; - if (!path || !*path) + if ((!path) || (!*path)) { memcpy(_evil_basename_buf, ".", 2); return _evil_basename_buf; Index: PROTO/evil/src/lib/evil_fcntl.c =================================================================== --- PROTO/evil/src/lib/evil_fcntl.c (revision 51690) +++ PROTO/evil/src/lib/evil_fcntl.c (working copy) @@ -76,7 +76,7 @@ len = (int)sizeof(int); ret = getsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, (char *)&type, &len); - if (!ret && (type == SOCK_STREAM)) + if ((!ret) && (type == SOCK_STREAM)) { if (!ioctlsocket((SOCKET)fd, FIONBIO, &arg) == SOCKET_ERROR) res = 0; Index: PROTO/evil/src/lib/evil_unistd.c =================================================================== --- PROTO/evil/src/lib/evil_unistd.c (revision 51690) +++ PROTO/evil/src/lib/evil_unistd.c (working copy) @@ -40,7 +40,7 @@ day = st.wDay + days[st.wMonth - 1]; - if (!(st.wYear & 3) && (st.wMonth > 2) ) + if ((!(st.wYear & 3)) && (st.wMonth > 2) ) day++; t = ((st.wYear - 70) * 365 + ((st.wYear - 1) >> 2) - 17 + day) * 24 + st.wHour; @@ -164,7 +164,7 @@ wchar_t *file; int permission = 0; - if (!file_name || !*file_name) + if ((!file_name) || (!*file_name)) return -1; f = strdup(file_name); Index: PROTO/evil/src/bin/evil_test_pipe.c =================================================================== --- PROTO/evil/src/bin/evil_test_pipe.c (revision 51690) +++ PROTO/evil/src/bin/evil_test_pipe.c (working copy) @@ -93,7 +93,7 @@ break; } } - if (d2 && (d2->val == d->val)) + if ((d2) && (d2->val == d->val)) ret = 1; else ret = 0; Index: PROTO/eyelight/src/lib/eyelight_object.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_object.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_object.c (working copy) @@ -77,7 +77,7 @@ const char * title = NULL; if(node_title) title = eyelight_retrieve_value_of_prop(node_title,0); - else if(!node_title && default_text) + else if((!node_title) && (default_text)) title = default_text; if(title) @@ -131,7 +131,7 @@ const char * subtitle = NULL; if(node_subtitle) subtitle = eyelight_retrieve_value_of_prop(node_subtitle,0); - else if(!node_subtitle && default_text) + else if((!node_subtitle) && (default_text)) subtitle = default_text; if(subtitle) { @@ -182,7 +182,7 @@ const char * header_image = NULL; if(node_header_image) header_image = eyelight_retrieve_value_of_prop(node_header_image,0); - else if(!node_header_image && default_image) + else if((!node_header_image) && (default_image)) header_image = default_image; if(header_image) { @@ -194,7 +194,7 @@ edje_object_load_error_get(o_header_image)); const Evas_Object *part_image = edje_object_part_object_get(o_header_image, "object.header_image"); char *image_path = eyelight_compile_image_path_new(pres,header_image); - evas_object_image_file_set((Evas_Object*)part_image, image_path, pres->dump_in || pres->dump_out ? header_image : NULL); + evas_object_image_file_set((Evas_Object*)part_image, image_path, (pres->dump_in) || (pres->dump_out) ? header_image : NULL); EYELIGHT_FREE(image_path); edje_object_size_min_calc(o_header_image, &w, &h); evas_object_size_hint_min_set(o_header_image, w, h); @@ -238,7 +238,7 @@ const char * foot_text = NULL; if(node_foot_text) foot_text = eyelight_retrieve_value_of_prop(node_foot_text,0); - else if(!node_foot_text && default_text) + else if((!node_foot_text) && (default_text)) foot_text = default_text; if(foot_text) { @@ -290,7 +290,7 @@ const char * foot_image = NULL; if(node_foot_image) foot_image = eyelight_retrieve_value_of_prop(node_foot_image,0); - else if(!node_foot_image && default_image) + else if((!node_foot_image) && (default_image)) foot_image = default_image; if(foot_image) { @@ -302,7 +302,7 @@ edje_object_load_error_get(o_foot_image)); const Evas_Object *part_image = edje_object_part_object_get(o_foot_image, "object.foot_image"); char *image_path = eyelight_compile_image_path_new(pres,foot_image); - evas_object_image_file_set((Evas_Object*)part_image, image_path, pres->dump_in || pres->dump_out ? foot_image : NULL); + evas_object_image_file_set((Evas_Object*)part_image, image_path, (pres->dump_in) || (pres->dump_out) ? foot_image : NULL); EYELIGHT_FREE(image_path); edje_object_size_min_calc(o_foot_image, &w, &h); evas_object_size_hint_min_set(o_foot_image, w, h); @@ -466,7 +466,7 @@ edje_object_load_error_get(o_image)); const Evas_Object *part_image = edje_object_part_object_get(o_image, "object.image"); char *image_path = eyelight_compile_image_path_new(pres,image); - evas_object_image_file_set((Evas_Object*)part_image, image_path, pres->dump_in || pres->dump_out ? image : NULL); + evas_object_image_file_set((Evas_Object*)part_image, image_path, (pres->dump_in) || (pres->dump_out) ? image : NULL); edje_object_size_min_calc(o_image, &w, &h); evas_object_size_hint_min_set(o_image, w, h); evas_object_size_hint_align_set(o_image, -1, -1); @@ -485,7 +485,7 @@ { Evas_Coord w, h; Evas_Object *o = evas_object_image_add(evas_object_evas_get(o_area)); - evas_object_image_file_set(o, image_path, pres->dump_in || pres->dump_out ? image : NULL); + evas_object_image_file_set(o, image_path, (pres->dump_in) || (pres->dump_out) ? image : NULL); evas_object_image_size_get(o, &w, &h); evas_object_del(o); aspect_x = w/(float)h; Index: PROTO/eyelight/src/lib/eyelight_viewer_gotoslide.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_viewer_gotoslide.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_viewer_gotoslide.c (working copy) @@ -68,7 +68,7 @@ void eyelight_viewer_gotoslide_goto(Eyelight_Viewer* pres) { - if(pres->size >= pres->gotoslide_number && pres->gotoslide_number>0) + if((pres->size >= pres->gotoslide_number) && (pres->gotoslide_number>0)) { eyelight_viewer_gotoslide_stop(pres); eyelight_viewer_slide_goto(pres, pres->gotoslide_number-1); Index: PROTO/eyelight/src/lib/eyelight_compiler.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_compiler.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_compiler.c (working copy) @@ -189,7 +189,7 @@ { Eyelight_Compiler* compiler; - if(!p_compiler || !(*p_compiler)) return ; + if((!p_compiler) || (!(*p_compiler))) return ; compiler = *p_compiler; @@ -234,7 +234,7 @@ Eyelight_Node* node; Eina_List *l; - if((*current)->type==EYELIGHT_NODE_TYPE_VALUE && (*current)->do_free) + if(((*current)->type==EYELIGHT_NODE_TYPE_VALUE) && ((*current)->do_free)) EYELIGHT_FREE((*current)->value); EINA_LIST_FOREACH( (*current)->l ,l ,node) @@ -255,10 +255,10 @@ Eyelight_Node *node; EINA_LIST_FOREACH(slide->node->l, l, node) { - if(node->type == EYELIGHT_NODE_TYPE_PROP && node->name == EYELIGHT_NAME_IGNORE_AREA) + if((node->type == EYELIGHT_NODE_TYPE_PROP) && (node->name == EYELIGHT_NAME_IGNORE_AREA)) { const char* name = eyelight_retrieve_value_of_prop(node, 0); - if(name && strcmp(name, area) == 0) + if((name) && (strcmp(name, area) == 0)) return node; } } @@ -286,7 +286,7 @@ EINA_LIST_FOREACH(current->l, l, node) { - if(node->type == EYELIGHT_NODE_TYPE_PROP && node->name == prop) + if((node->type == EYELIGHT_NODE_TYPE_PROP) && (node->name == prop)) return node; } @@ -305,16 +305,16 @@ EINA_LIST_FOREACH(current->l, l, node) { - if(node->type == EYELIGHT_NODE_TYPE_BLOCK && node->name == EYELIGHT_NAME_ITEMS) + if((node->type == EYELIGHT_NODE_TYPE_BLOCK) && (node->name == EYELIGHT_NAME_ITEMS)) number+=eyelight_number_item_in_block(node); - else if(node->type==EYELIGHT_NODE_TYPE_BLOCK && - ( node->name == EYELIGHT_NAME_ITEM - || node->name == EYELIGHT_NAME_IMAGE - || node->name == EYELIGHT_NAME_EDJ)) + else if((node->type==EYELIGHT_NODE_TYPE_BLOCK) && + ( (node->name == EYELIGHT_NAME_ITEM) + || (node->name == EYELIGHT_NAME_IMAGE) + || (node->name == EYELIGHT_NAME_EDJ))) number++; - else if(node->type == EYELIGHT_NODE_TYPE_PROP && - ( node->name == EYELIGHT_NAME_TEXT - || node->name == EYELIGHT_NAME_IMAGE)) + else if((node->type == EYELIGHT_NODE_TYPE_PROP) && + ( (node->name == EYELIGHT_NAME_TEXT) + || (node->name == EYELIGHT_NAME_IMAGE))) number++; } return number; @@ -348,7 +348,7 @@ EINA_LIST_FOREACH(slide->areas, l, area) { - if(area->name && strcmp(area->name, name) == 0) + if((area->name) && (strcmp(area->name, name) == 0)) return area; } @@ -582,7 +582,7 @@ node_file = eyelight_retrieve_node_prop(node_edj,EYELIGHT_NAME_FILE); node_group = eyelight_retrieve_node_prop(node_edj,EYELIGHT_NAME_GROUP); - if(node_group && node_file) + if((node_group) && (node_file)) { eyelight_object_item_edje_add(pres,slide,node_edj, area, eyelight_retrieve_value_of_prop(node_file,0), @@ -607,7 +607,7 @@ if(node_numbering) numbering = eyelight_retrieve_value_of_prop(node_numbering,0); - if(numbering && strcmp(numbering,"none")==0) + if((numbering) && (strcmp(numbering,"none")==0)) numbering = NULL; EINA_LIST_FOREACH(node_items->l, l, node) @@ -866,7 +866,7 @@ int i_slide = -1; l = compiler->root->l; - while( l && i_slidetype) @@ -942,7 +942,7 @@ } evas_object_image_size_get(im, &w, &h); - if (w <= 1 && h <= 1) + if ((w <= 1) && (h <= 1)) { evas_object_image_load_size_set(im, presw, presh); evas_object_image_size_get(im, &w, &h); @@ -1121,7 +1121,7 @@ for(i = 0; i < len; i++) { - if(dec[i] >= '0' && dec[i] <= '9') + if((dec[i] >= '0') && (dec[i] <= '9')) { switch(len - i) { @@ -1182,19 +1182,19 @@ int find = 0; EINA_LIST_FOREACH(slide->areas,l2, area) { - if(area->name && strcmp(area->name, area_name) == 0) + if((area->name) && (strcmp(area->name, area_name) == 0)) { find = 1; break; } } - if(!find && !eyelight_ignore_area_is(slide, area_name)) + if((!find) && (!eyelight_ignore_area_is(slide, area_name))) { char *rel1_x=NULL, *rel1_y=NULL, *rel2_x=NULL, *rel2_y=NULL; eyelight_theme_area_desc_get(slide, area_name, &rel1_x, &rel1_y, &rel2_x, &rel2_y); - if(!rel1_x || !rel1_y || !rel2_x || !rel2_y) + if((!rel1_x) || (!rel1_y) || (!rel2_x) || (!rel2_y)) { EYELIGHT_FREE(area_name); continue; Index: PROTO/eyelight/src/lib/edit/edit.c =================================================================== --- PROTO/eyelight/src/lib/edit/edit.c (revision 51690) +++ PROTO/eyelight/src/lib/edit/edit.c (working copy) @@ -49,11 +49,11 @@ // if(node->obj) then the item is displayed EINA_LIST_FOREACH(father->l, l, node) { - if(node->obj && node == edit->node) + if((node->obj) && (node == edit->node)) find = 1; - else if(node->obj && find == 1) + else if((node->obj) && (find == 1)) find = 2; - else if(node->obj && find == 2) + else if((node->obj) && (find == 2)) { next_next = node; break; @@ -98,7 +98,7 @@ father = edit->node->father; EINA_LIST_FOREACH(father->l, l, node) { - if(node->obj && node != edit->node) + if((node->obj) && (node != edit->node)) previous = node; else if(node->obj) break; Index: PROTO/eyelight/src/lib/edit/edit_slide.c =================================================================== --- PROTO/eyelight/src/lib/edit/edit_slide.c (revision 51690) +++ PROTO/eyelight/src/lib/edit/edit_slide.c (working copy) @@ -22,7 +22,7 @@ //it is the title define outside a slide block int i_slide = -1; l = compiler->root->l; - while( l && i_slidetype) @@ -104,8 +104,8 @@ int i=0; EINA_LIST_FOREACH(pres->compiler->root->l, l, node) { - if(node->type == EYELIGHT_NODE_TYPE_BLOCK - && node->name == EYELIGHT_NAME_SLIDE) + if((node->type == EYELIGHT_NODE_TYPE_BLOCK) + && (node->name == EYELIGHT_NAME_SLIDE)) { if(i==after) break; @@ -165,8 +165,8 @@ int i=0; EINA_LIST_FOREACH(pres->compiler->root->l, l, node) { - if(node->type == EYELIGHT_NODE_TYPE_BLOCK - && node->name == EYELIGHT_NAME_SLIDE) + if((node->type == EYELIGHT_NODE_TYPE_BLOCK) + && (node->name == EYELIGHT_NAME_SLIDE)) { if(i==id_slide) break; @@ -226,8 +226,8 @@ Eina_List *l_relative; EINA_LIST_FOREACH(pres->compiler->root->l, l, node) { - if(node->type == EYELIGHT_NODE_TYPE_BLOCK - && node->name == EYELIGHT_NAME_SLIDE) + if((node->type == EYELIGHT_NODE_TYPE_BLOCK) + && (node->name == EYELIGHT_NAME_SLIDE)) { if(i==id_slide) { @@ -241,7 +241,7 @@ } i++; - if(node_slide && (node_relative || id_after == -1)) + if((node_slide) && ((node_relative) || (id_after == -1))) break; } } @@ -293,7 +293,7 @@ //look if we have a custom area or a theme area with the same name EINA_LIST_FOREACH(slide->areas,l2, area) { - if(area->name && strcmp(area->name, area_name) == 0) + if((area->name) && (strcmp(area->name, area_name) == 0)) { slide->areas = eina_list_remove(slide->areas, area); slide->node->l = eina_list_remove(slide->node->l, area->node_def); Index: PROTO/eyelight/src/lib/edit/edit_image.c =================================================================== --- PROTO/eyelight/src/lib/edit/edit_image.c (revision 51690) +++ PROTO/eyelight/src/lib/edit/edit_image.c (working copy) @@ -25,8 +25,8 @@ void eyelight_edit_area_image_add(Eyelight_Viewer *pres, Eyelight_Edit *edit, const char* image) { EYELIGHT_ASSERT_RETURN_VOID(!!edit); - EYELIGHT_ASSERT_RETURN_VOID(edit->node->name == EYELIGHT_NAME_CUSTOM_AREA - || edit->node->name == EYELIGHT_NAME_THEME_AREA); + EYELIGHT_ASSERT_RETURN_VOID((edit->node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (edit->node->name == EYELIGHT_NAME_THEME_AREA)); EYELIGHT_ASSERT_RETURN_VOID(!!image); char *area_name = eyelight_retrieve_value_of_prop(edit->node,0); Index: PROTO/eyelight/src/lib/edit/edit_area.c =================================================================== --- PROTO/eyelight/src/lib/edit/edit_area.c (revision 51690) +++ PROTO/eyelight/src/lib/edit/edit_area.c (working copy) @@ -25,8 +25,8 @@ void eyelight_edit_area_geometry_get(Eyelight_Edit *edit, double *rel1_x, double *rel1_y, double *rel2_x, double *rel2_y) { EYELIGHT_ASSERT_RETURN_VOID(!!edit); - EYELIGHT_ASSERT_RETURN_VOID(edit->node->name == EYELIGHT_NAME_CUSTOM_AREA - || edit->node->name == EYELIGHT_NAME_THEME_AREA); + EYELIGHT_ASSERT_RETURN_VOID((edit->node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (edit->node->name == EYELIGHT_NAME_THEME_AREA)); *rel1_x = atof(eyelight_retrieve_value_of_prop(edit->node,1)); *rel1_y = atof(eyelight_retrieve_value_of_prop(edit->node,2)); @@ -39,8 +39,8 @@ Eyelight_Node *node_layout, *node_area; EYELIGHT_ASSERT_RETURN(!!edit); - EYELIGHT_ASSERT_RETURN(edit->node->name == EYELIGHT_NAME_CUSTOM_AREA - || edit->node->name == EYELIGHT_NAME_THEME_AREA); + EYELIGHT_ASSERT_RETURN((edit->node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (edit->node->name == EYELIGHT_NAME_THEME_AREA)); node_area = _get_area_from_area(edit->slide, edit->node); if(!node_area) @@ -59,8 +59,8 @@ char buf[EYELIGHT_BUFLEN]; EYELIGHT_ASSERT_RETURN_VOID(!!edit); - EYELIGHT_ASSERT_RETURN_VOID(edit->node->name == EYELIGHT_NAME_CUSTOM_AREA - || edit->node->name == EYELIGHT_NAME_THEME_AREA); + EYELIGHT_ASSERT_RETURN_VOID((edit->node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (edit->node->name == EYELIGHT_NAME_THEME_AREA)); EYELIGHT_ASSERT_RETURN_VOID(!!layout); node_area = _get_area_from_area(edit->slide, edit->node); @@ -91,8 +91,8 @@ Eyelight_Node *data; EYELIGHT_ASSERT_RETURN_VOID(!!edit); - EYELIGHT_ASSERT_RETURN_VOID(edit->node->name == EYELIGHT_NAME_CUSTOM_AREA - || edit->node->name == EYELIGHT_NAME_THEME_AREA); + EYELIGHT_ASSERT_RETURN_VOID((edit->node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (edit->node->name == EYELIGHT_NAME_THEME_AREA)); Eyelight_Area *e_area = eyelight_retrieve_area_from_node(edit->slide, edit->node); edit->node->name = EYELIGHT_NAME_CUSTOM_AREA; @@ -136,8 +136,8 @@ int find_current = 0; EYELIGHT_ASSERT_RETURN_VOID(!!edit); - EYELIGHT_ASSERT_RETURN_VOID(edit->node->name == EYELIGHT_NAME_CUSTOM_AREA - || edit->node->name == EYELIGHT_NAME_THEME_AREA); + EYELIGHT_ASSERT_RETURN_VOID((edit->node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (edit->node->name == EYELIGHT_NAME_THEME_AREA)); Eyelight_Area *e_area = eyelight_retrieve_area_from_node(edit->slide,edit->node); edit->node->name = EYELIGHT_NAME_CUSTOM_AREA; @@ -150,13 +150,13 @@ { if(node == edit->node) find_current = 1; - else if(find_current==1 - && (node->name == EYELIGHT_NAME_CUSTOM_AREA - || node->name == EYELIGHT_NAME_THEME_AREA) ) + else if((find_current==1) + && ((node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (node->name == EYELIGHT_NAME_THEME_AREA)) ) find_current = 2; - else if(find_current==2 - && (node->name == EYELIGHT_NAME_CUSTOM_AREA - || node->name == EYELIGHT_NAME_THEME_AREA)) + else if((find_current==2) + && ((node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (node->name == EYELIGHT_NAME_THEME_AREA))) { next_next = node; break; @@ -188,8 +188,8 @@ Eyelight_Node *node; EYELIGHT_ASSERT_RETURN_VOID(!!edit); - EYELIGHT_ASSERT_RETURN_VOID(edit->node->name == EYELIGHT_NAME_CUSTOM_AREA - || edit->node->name == EYELIGHT_NAME_THEME_AREA); + EYELIGHT_ASSERT_RETURN_VOID((edit->node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (edit->node->name == EYELIGHT_NAME_THEME_AREA)); Eyelight_Area *e_area = eyelight_retrieve_area_from_node(edit->slide,edit->node); edit->node->name = EYELIGHT_NAME_CUSTOM_AREA; @@ -201,8 +201,8 @@ { if(node == edit->node) break; - else if(node->name == EYELIGHT_NAME_CUSTOM_AREA - || node->name == EYELIGHT_NAME_THEME_AREA) + else if((node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (node->name == EYELIGHT_NAME_THEME_AREA)) prev = node; } @@ -252,7 +252,7 @@ int id = 0; EINA_LIST_FOREACH(pres->compiler->root->l, l, _node) { - if(id == id_slide && _node->name == EYELIGHT_NAME_SLIDE) + if((id == id_slide) && (_node->name == EYELIGHT_NAME_SLIDE)) { node = _node; break; @@ -308,8 +308,8 @@ Eina_List *l; EYELIGHT_ASSERT_RETURN_VOID(!!edit); - EYELIGHT_ASSERT_RETURN_VOID(edit->node->name == EYELIGHT_NAME_CUSTOM_AREA - || edit->node->name == EYELIGHT_NAME_THEME_AREA); + EYELIGHT_ASSERT_RETURN_VOID((edit->node->name == EYELIGHT_NAME_CUSTOM_AREA) + || (edit->node->name == EYELIGHT_NAME_THEME_AREA)); char *name = eyelight_retrieve_value_of_prop(edit->node,0); EYELIGHT_ASSERT_RETURN_VOID(!!name); @@ -387,7 +387,7 @@ { Eyelight_Node *area = edit->node; - while(area && area->name != EYELIGHT_NAME_AREA) + while((area) && (area->name != EYELIGHT_NAME_AREA)) area = area->father; return area; Index: PROTO/eyelight/src/lib/eyelight_viewer_tableofcontents.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_viewer_tableofcontents.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_viewer_tableofcontents.c (working copy) @@ -85,12 +85,12 @@ Eyelight_Node *node; i=0; l = pres->compiler->root->l; - while(itype == EYELIGHT_NODE_TYPE_BLOCK && node->name == EYELIGHT_NAME_SLIDE) + if((node->type == EYELIGHT_NODE_TYPE_BLOCK) && (node->name == EYELIGHT_NAME_SLIDE)) i++; - else if( node->type == EYELIGHT_NODE_TYPE_PROP && node->name == EYELIGHT_NAME_TITLE) + else if( (node->type == EYELIGHT_NODE_TYPE_PROP) && (node->name == EYELIGHT_NAME_TITLE)) default_title = eyelight_retrieve_value_of_prop(node,0); l = eina_list_next(l); } @@ -106,15 +106,15 @@ buf,"eyelight"); i++; } - else if( node->type == EYELIGHT_NODE_TYPE_PROP && node->name == EYELIGHT_NAME_TITLE) + else if( (node->type == EYELIGHT_NODE_TYPE_PROP) && (node->name == EYELIGHT_NAME_TITLE)) { default_title = eyelight_retrieve_value_of_prop(node,0); l = eina_list_next(l); node = eina_list_data_get(l); } - else if(node->type == EYELIGHT_NODE_TYPE_BLOCK && node->name == EYELIGHT_NAME_SLIDE) + else if((node->type == EYELIGHT_NODE_TYPE_BLOCK) && (node->name == EYELIGHT_NAME_SLIDE)) { - if(first_slide+i<0 || i+first_slide>=pres->size) + if((first_slide+i<0) || (i+first_slide>=pres->size)) { snprintf(buf,EYELIGHT_BUFLEN,"tableofcontents,slide,hide,%d",i+1); edje_object_signal_emit(pres->tableofcontents_background, Index: PROTO/eyelight/src/lib/eyelight_viewer_slideshow.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_viewer_slideshow.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_viewer_slideshow.c (working copy) @@ -81,7 +81,7 @@ for(i=0;i=pres->size) + if((first_slide+i<0) || (i+first_slide>=pres->size)) { snprintf(buf,EYELIGHT_BUFLEN,"slideshow,slide,hide,%d",i+1); edje_object_signal_emit(pres->slideshow_background, Index: PROTO/eyelight/src/lib/eyelight_smart.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_smart.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_smart.c (working copy) @@ -143,7 +143,7 @@ Smart_Data *sd; E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); - if (!sd->pres || !eye) return; + if ((!sd->pres) || (!eye)) return; eyelight_object_theme_file_set(obj, eye); eyelight_viewer_eye_file_set(sd->pres, eye); @@ -638,7 +638,7 @@ eyelight_object_gotoslide_digit_last_remove(eyelight_smart); break; default: - if (strlen(event->key) == 1 && strchr("0123456789", *event->key)) + if ((strlen(event->key) == 1) && (strchr("0123456789", *event->key))) eyelight_object_gotoslide_digit_add(eyelight_smart,atoi(event->key)); break; } @@ -704,7 +704,7 @@ eyelight_object_tableofcontents_start(eyelight_smart,eyelight_object_current_id_get(eyelight_smart)); break; default: - if (strlen(event->key) == 1 && strchr("0123456789", *event->key)) + if ((strlen(event->key) == 1) && (strchr("0123456789", *event->key))) { eyelight_object_gotoslide_start(eyelight_smart); eyelight_object_gotoslide_digit_add(eyelight_smart,atoi(event->key)); Index: PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_viewer_thumbnails.c (working copy) @@ -72,7 +72,7 @@ for(i=0; islides, i); - if(slide->thumb.thumb || (pres->dump_in && slide->thumb.pos >= 0)) + if((slide->thumb.thumb) || ((pres->dump_in) && (slide->thumb.pos >= 0))) { EYELIGHT_FREE(slide->thumb.thumb); eyelight_viewer_thumbnails_get(pres, i); @@ -210,7 +210,7 @@ int i; for(i=0;isize;i++) - if(!pres->thumbnails.is_background_load && (i=max) ) + if((!pres->thumbnails.is_background_load) && ((i=max)) ) { Eyelight_Slide *slide = eina_list_nth(pres->slides, i); EYELIGHT_FREE(slide->thumb.thumb); Index: PROTO/eyelight/src/lib/eyelight_parser.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_parser.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_parser.c (working copy) @@ -101,7 +101,7 @@ */ int eyelight_is_char_token(char* p) { - if(*p == '{' || *p=='}' || *p==';' || *p==':') + if((*p == '{') || (*p=='}') || (*p==';') || (*p==':')) return 1; else return 0; @@ -112,7 +112,7 @@ */ int eyelight_is_end_token(char* p) { - if(eyelight_is_char_token(p) || *p == '\n' || *p==' ') + if((eyelight_is_char_token(p)) || (*p == '\n') || (*p==' ')) return 1; else return 0; @@ -205,28 +205,28 @@ if(p>=end) return NULL; - while(!done && pline++; p++; } - else if(!in_comment && !tok_start && (*p ==' ' || *p == '\t')) + else if((!in_comment) && (!tok_start) && ((*p ==' ') || (*p == '\t'))) p++; - else if(!in_comment && !tok_start && *p=='\n') + else if((!in_comment) && (!tok_start) && (*p=='\n')) { compiler->line++; p++; } - else if( !in_comment && !tok_start || !eyelight_is_end_token(p) || string) + else if( ((!in_comment) && (!tok_start)) || (!eyelight_is_end_token(p)) || (string)) { if(!tok_start) { @@ -244,7 +244,7 @@ else { tok_end = p; - if(string && eyelight_is_string_token(p)) + if((string) && (eyelight_is_string_token(p))) done = 1; } p++; @@ -285,8 +285,8 @@ { int i; for (i = 0; i < sizeof (eyelight_valid_block_block) / sizeof (Eyelight_Valid_Prop_Block); ++i) - if (block == eyelight_valid_block_block[i].block - && p == eyelight_valid_block_block[i].block_prop) + if ((block == eyelight_valid_block_block[i].block) + && (p == eyelight_valid_block_block[i].block_prop)) { return 1; } @@ -301,8 +301,8 @@ { int i; for (i = 0; i < sizeof (eyelight_valid_prop_block) / sizeof (Eyelight_Valid_Prop_Block); ++i) - if (block == eyelight_valid_prop_block[i].block - && prop == eyelight_valid_prop_block[i].block_prop) + if ((block == eyelight_valid_prop_block[i].block) + && (prop == eyelight_valid_prop_block[i].block_prop)) { return 1; } @@ -335,8 +335,8 @@ int i; for (i = 0; i < sizeof (eyelight_prop_value_type) / sizeof (Eyelight_Prop_Value_Type); ++i) - if (prop == eyelight_prop_value_type[i].name - && pos == eyelight_prop_value_type[i].arg_pos) + if ((prop == eyelight_prop_value_type[i].name) + && (pos == eyelight_prop_value_type[i].arg_pos)) { type = eyelight_prop_value_type[i].type; break; @@ -439,10 +439,10 @@ case EYELIGHT_VALUE_TYPE_DOUBLE: errno = 0; v = strtod(value_list[i],&end_float); - if(*end_float != '\0' - || (errno == ERANGE && - (v == LONG_MAX || v == LONG_MIN)) - || (errno != 0 && v == 0)) + if((*end_float != '\0') + || ((errno == ERANGE) && + ((v == LONG_MAX) || (v == LONG_MIN))) + || ((errno != 0) && (v == 0))) { ERR("(line %d) The %d st value of the property %d has to be a float",compiler->line,i,current_node->name); exit(EXIT_FAILURE); @@ -451,10 +451,10 @@ case EYELIGHT_VALUE_TYPE_INT: errno = 0; v = strtol(value_list[i],&end_float,0); - if(*end_float != '\0' - || (errno == ERANGE && - (v == LONG_MAX || v == LONG_MIN)) - || (errno != 0 && v == 0)) + if((*end_float != '\0') + || ((errno == ERANGE) && + ((v == LONG_MAX) || (v == LONG_MIN))) + || ((errno != 0) && (v == 0))) { ERR("(line %d) The %d st value of the property %d has to be an integer",compiler->line,i,current_node->name); exit(EXIT_FAILURE); Index: PROTO/eyelight/src/lib/eyelight_viewer.c =================================================================== --- PROTO/eyelight/src/lib/eyelight_viewer.c (revision 51690) +++ PROTO/eyelight/src/lib/eyelight_viewer.c (working copy) @@ -108,7 +108,7 @@ eyelight_viewer_clean(pres); - if(presentation && ecore_file_exists(presentation)) + if((presentation) && (ecore_file_exists(presentation))) pres->elt_file = strdup(presentation); else pres->elt_file = NULL; @@ -141,7 +141,7 @@ eyelight_viewer_clean(pres); - if(presentation && ecore_file_exists(presentation)) + if((presentation) && (ecore_file_exists(presentation))) pres->elt_file = strdup(presentation); else pres->elt_file = NULL; @@ -169,7 +169,7 @@ int eyelight_viewer_eye_file_set(Eyelight_Viewer *pres, const char *eye) { EYELIGHT_FREE(pres->dump_in); - if (!eye || !ecore_file_exists(eye)) + if ((!eye) || (!ecore_file_exists(eye))) return EINA_FALSE; eyelight_viewer_clean(pres); @@ -548,7 +548,7 @@ Eyelight_Viewer*pres = (Eyelight_Viewer*)data; int i; for(i=0;i<2;i++) - if(pres->slide_with_transition[i] && pres->slide_with_transition[i]->obj==o) + if((pres->slide_with_transition[i]) && (pres->slide_with_transition[i]->obj==o)) pres->slide_with_transition[i] = NULL; } @@ -653,7 +653,7 @@ int i_slide = -1; //retrieve the slide and the layout - while( l && i_slide < pos) + while( (l) && (i_slide < pos)) { node = eina_list_data_get(l); switch(node->type) @@ -685,7 +685,7 @@ //search the layout Eyelight_Node *node_layout = eyelight_retrieve_node_prop(node_slide, EYELIGHT_NAME_LAYOUT); char * layout = NULL; - if(!node_layout && !default_layout) + if((!node_layout) && (!default_layout)) layout = "blank"; else if(!node_layout) layout = default_layout; @@ -729,9 +729,9 @@ i=0; EINA_LIST_FOREACH(pres->slides, l, slide) { - if(slide->obj && (icurrent-1 || i>pres->current+1)) + if((slide->obj) && ((icurrent-1) || (i>pres->current+1))) eyelight_slide_clean(slide); - else if(!slide->obj && i>=pres->current-1 && i<=pres->current+1) + else if((!slide->obj) && (i>=pres->current-1) && (i<=pres->current+1)) { slide->obj = eyelight_viewer_slide_get(pres,slide,i); } @@ -854,7 +854,7 @@ slide->obj = eyelight_viewer_slide_get(pres,slide, slide_id); edje_object_signal_emit(slide->obj,"show","eyelight"); - if(pres->current!=slide_id && pres->current>=0) + if((pres->current!=slide_id) && (pres->current>=0)) { slide = eina_list_nth(pres->slides, pres->current); slide->obj = eyelight_viewer_slide_get(pres,slide, pres->current); Index: PROTO/eyelight/src/bin/eyelight.c =================================================================== --- PROTO/eyelight/src/bin/eyelight.c (revision 51690) +++ PROTO/eyelight/src/bin/eyelight.c (working copy) @@ -194,8 +194,8 @@ if(is_help) { - if(action == EYELIGHT_HELP - || action == EYELIGHT_QUIT) + if((action == EYELIGHT_HELP) + || (action == EYELIGHT_QUIT)) { is_help = 0; evas_object_del(help_background); @@ -250,7 +250,7 @@ eyelight_object_gotoslide_digit_last_remove(eyelight_smart); break; default: - if (strlen(event->key) == 1 && strchr("0123456789", *event->key)) + if ((strlen(event->key) == 1) && (strchr("0123456789", *event->key))) eyelight_object_gotoslide_digit_add(eyelight_smart,atoi(event->key)); break; } @@ -329,7 +329,7 @@ return ; break; default: - if (event->key && strlen(event->key) == 1 && strchr("0123456789", *event->key)) + if ((event->key) && (strlen(event->key) == 1) && (strchr("0123456789", *event->key))) { eyelight_object_gotoslide_start(eyelight_smart); eyelight_object_gotoslide_digit_add(eyelight_smart,atoi(event->key)); @@ -443,26 +443,26 @@ goto shutdown_eyelight; } - if(exit_option || engines_listed) + if((exit_option) || (engines_listed)) goto shutdown_eyelight; - if ((presentation || theme) && dump_in) + if (((presentation) || (theme)) && (dump_in)) { ERR("You can't set an eye file as an input if you want to specify a theme and a presentation.\nBetter specify it with -o."); goto shutdown_eyelight; } - if((dump_out || !dump_in) && !presentation) + if(((dump_out) || (!dump_in)) && (!presentation)) { ERR("A presentation is required!"); goto shutdown_eyelight; } - if(presentation && (ecore_file_is_dir(presentation) || !ecore_file_exists(presentation))) + if((presentation) && ((ecore_file_is_dir(presentation)) || (!ecore_file_exists(presentation)))) { ERR("The presentation file doesn't exists."); goto shutdown_eyelight; - } else if (dump_in && (ecore_file_is_dir(dump_in) || !ecore_file_exists(dump_in))) + } else if ((dump_in) && ((ecore_file_is_dir(dump_in)) || (!ecore_file_exists(dump_in)))) { ERR("The eye file doesn't exists."); goto shutdown_eyelight; Index: PROTO/epdf/src/plugins/ewl/ewl_pdf.c =================================================================== --- PROTO/epdf/src/plugins/ewl/ewl_pdf.c (revision 51690) +++ PROTO/epdf/src/plugins/ewl/ewl_pdf.c (working copy) @@ -180,7 +180,7 @@ l1 = strlen (path); l2 = strlen (filename); - if (!path || (path[0] == '\0')) + if ((!path) || (path[0] == '\0')) file = strdup (filename); else { file = (char *)malloc (sizeof (char) * (l1 + l2 + 2)); Index: PROTO/epdf/src/lib/ewl_pdf.c =================================================================== --- PROTO/epdf/src/lib/ewl_pdf.c (revision 51690) +++ PROTO/epdf/src/lib/ewl_pdf.c (working copy) @@ -125,7 +125,7 @@ w = EWL_WIDGET(pdf); - if (!filename || (filename[0] == '\0')) + if ((!filename) || (filename[0] == '\0')) DRETURN_INT(FALSE, DLEVEL_STABLE); if (pdf->filename != filename) { @@ -211,8 +211,8 @@ DCHECK_PARAM_PTR(pdf); DCHECK_TYPE(pdf, EWL_PDF_TYPE); - if (!pdf->pdf_document || - !pdf->pdf_page || + if ((!pdf->pdf_document) || + (!pdf->pdf_page) || (page < 0) || (page >= epdf_document_page_count_get(pdf->pdf_document)) || (page == epdf_page_page_get(pdf->pdf_page))) @@ -283,7 +283,7 @@ DCHECK_PARAM_PTR(pdf); DCHECK_TYPE(pdf, EWL_PDF_TYPE); - if (!pdf->pdf_page || (epdf_page_orientation_get(pdf->pdf_page) == o)) + if ((!pdf->pdf_page) || (epdf_page_orientation_get(pdf->pdf_page) == o)) DRETURN(DLEVEL_STABLE); pdf->dirty = 1; @@ -439,8 +439,8 @@ DCHECK_TYPE(pdf, EWL_PDF_TYPE); if ((!text) || - (pdf->search.text && - strcmp(text, pdf->search.text) == 0)) + ((pdf->search.text) && + (strcmp(text, pdf->search.text) == 0))) DRETURN(DLEVEL_STABLE); if (pdf->search.text) free(pdf->search.text); @@ -535,8 +535,8 @@ next_page: /* no list, we search one */ - while (!pdf->search.list && - pdf->search.page < epdf_document_page_count_get(pdf->pdf_document)) { + while ((!pdf->search.list) && + (pdf->search.page < epdf_document_page_count_get(pdf->pdf_document))) { Epdf_Page *page; pdf->search.page++; @@ -661,7 +661,7 @@ DCHECK_TYPE(w, EWL_WIDGET_TYPE); pdf = EWL_PDF(w); - if (!pdf->image || !pdf->pdf_page) + if ((!pdf->image) || (!pdf->pdf_page)) DRETURN(DLEVEL_STABLE); emb = ewl_embed_widget_find(w); @@ -780,7 +780,7 @@ emb = ewl_embed_widget_find(w); pdf = EWL_PDF(w); - if (emb && pdf->image) { + if ((emb) && (pdf->image)) { ewl_embed_object_cache(emb, pdf->image); pdf->image = NULL; } Index: PROTO/epdf/src/lib/esmart_pdf.c =================================================================== --- PROTO/epdf/src/lib/esmart_pdf.c (revision 51690) +++ PROTO/epdf/src/lib/esmart_pdf.c (working copy) @@ -197,7 +197,7 @@ E_SMART_OBJ_GET(sp, obj, E_OBJ_NAME); - if (!sp->pdf_document || + if ((!sp->pdf_document) || (page < 0) || (page >= epdf_document_page_count_get (sp->pdf_document)) || (page == epdf_page_page_get (sp->pdf_page))) Index: PROTO/epdf/src/lib/mupdf/epdf_mupdf_index.c =================================================================== --- PROTO/epdf/src/lib/mupdf/epdf_mupdf_index.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/epdf_mupdf_index.c (working copy) @@ -72,7 +72,7 @@ Epdf_Link_Action_Kind epdf_index_item_action_kind_get(const Epdf_Index_Item *item) { - if (!item || !item->link) + if ((!item) || (!item->link)) return EPDF_LINK_ACTION_UNKNOWN; if (PDF_LURI == item->link->kind) @@ -89,7 +89,7 @@ int n; int g; - if (!item || !item->link) + if ((!item) || (!item->link)) return -1; if (PDF_LGOTO != item->link->kind) @@ -108,7 +108,7 @@ fz_obj *D; D = fz_dictgets(dest, "D"); - if (D && fz_isarray(D)) + if ((D) && (fz_isarray(D))) dest = fz_arrayget(D, 0); } @@ -127,7 +127,7 @@ np = fz_tonum(page); gp = fz_togen(page); - if (n == np && g == gp) + if ((n == np) && (g == gp)) return p-1; } @@ -166,7 +166,7 @@ { Epdf_Index_Item *item; - if (!items || !entry) + if ((!items) || (!entry)) return; item = epdf_index_item_new(); Index: PROTO/epdf/src/lib/mupdf/epdf_mupdf_page.c =================================================================== --- PROTO/epdf/src/lib/mupdf/epdf_mupdf_page.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/epdf_mupdf_page.c (working copy) @@ -169,7 +169,7 @@ ctm = epdf_page_viewctm(page); - if (w < 0 || h < 0) + if ((w < 0) || (h < 0)) { bbox = fz_transformaabb(ctm, page->page->mediabox); } @@ -183,7 +183,7 @@ error = fz_rendertree(&image, doc->rast, page->page->tree, ctm, fz_roundrect(bbox), 1); - if (error || !image) + if ((error) || (!image)) return; width = image->w; @@ -275,7 +275,7 @@ double hscale, double vscale) { - if (!page || !page->doc) + if ((!page) || (!page->doc)) return; page->doc->zoom = hscale; @@ -286,7 +286,7 @@ double *hscale, double *vscale) { - if (!page || !page->doc) + if ((!page) || (!page->doc)) { *hscale = 0.0; *vscale = 0.0; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/unix/x11pdf.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/unix/x11pdf.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/unix/x11pdf.c (working copy) @@ -237,7 +237,7 @@ static void fillrect(int x, int y, int w, int h) { - if (w > 0 && h > 0) + if ((w > 0) && (h > 0)) XFillRectangle(xdpy, xwin, xgc, x, y, w, h); } @@ -286,7 +286,7 @@ fillrect(x0+2, y1, gapp.image->w, 2); fillrect(x1, y0+2, 2, gapp.image->h); - if (gapp.iscopying || justcopied) + if ((gapp.iscopying) || (justcopied)) invertcopyrect(); ximage_blit(xwin, xgc, @@ -297,7 +297,7 @@ gapp.image->h, gapp.image->w * gapp.image->n); - if (gapp.iscopying || justcopied) + if ((gapp.iscopying) || (justcopied)) invertcopyrect(); } @@ -453,7 +453,7 @@ static void onmouse(int x, int y, int btn, int modifiers, int state) { - if (state != 0 && justcopied) + if ((state != 0) && (justcopied)) { justcopied = 0; winrepaint(&gapp); @@ -470,8 +470,8 @@ static void winawaitevent(struct timeval *tmo, struct timeval *tmo_at) { - if (tmo_at->tv_sec == 0 && tmo_at->tv_usec == 0 && - tmo->tv_sec == 0 && tmo->tv_usec == 0) + if ((tmo_at->tv_sec == 0) && (tmo_at->tv_usec == 0) && + (tmo->tv_sec == 0) && (tmo->tv_usec == 0)) XNextEvent(xdpy, &xevt); else { @@ -566,8 +566,8 @@ { winawaitevent(&tmo, &tmo_at); - if (tmo_at.tv_sec != 0 && tmo_at.tv_usec != 0 && - tmo.tv_sec == 0 && tmo.tv_usec == 0) + if ((tmo_at.tv_sec != 0) && (tmo_at.tv_usec != 0) && + (tmo.tv_sec == 0) && (tmo.tv_usec == 0)) { /* redraw page */ winblit(&gapp); @@ -585,8 +585,8 @@ case ConfigureNotify: if (gapp.image) { - if (xevt.xconfigure.width != reqw || - xevt.xconfigure.height != reqh) + if ((xevt.xconfigure.width != reqw) || + (xevt.xconfigure.height != reqh)) gapp.shrinkwrap = 0; } pdfapp_onresize(&gapp, @@ -613,7 +613,7 @@ } } - if (!wasshowingpage && isshowingpage) + if ((!wasshowingpage) && (isshowingpage)) winsettmo(&tmo, &tmo_at); break; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/unix/ximage.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/unix/ximage.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/unix/ximage.c (working copy) @@ -161,7 +161,7 @@ static void make_colormap(void) { - if (info.visual.class == PseudoColor && info.visual.depth == 8) + if ((info.visual.class == PseudoColor) && (info.visual.depth == 8)) { int i, r, g, b; i = 0; @@ -232,25 +232,25 @@ info.mode = BGR233; } else if (info.bitsperpixel == 16) { - if (rm == 0xF800 && gm == 0x07E0 && bm == 0x001F) + if ((rm == 0xF800) && (gm == 0x07E0) && (bm == 0x001F)) info.mode = !byterev ? RGB565 : RGB565_BR; - if (rm == 0x7C00 && gm == 0x03E0 && bm == 0x001F) + if ((rm == 0x7C00) && (gm == 0x03E0) && (bm == 0x001F)) info.mode = !byterev ? RGB555 : RGB555_BR; } else if (info.bitsperpixel == 24) { - if (rs == 0 && gs == 8 && bs == 16) + if ((rs == 0) && (gs == 8) && (bs == 16)) info.mode = byteorder == MSBFirst ? RGB888 : BGR888; - if (rs == 16 && gs == 8 && bs == 0) + if ((rs == 16) && (gs == 8) && (bs == 0)) info.mode = byteorder == MSBFirst ? BGR888 : RGB888; } else if (info.bitsperpixel == 32) { - if (rs == 0 && gs == 8 && bs == 16) + if ((rs == 0) && (gs == 8) && (bs == 16)) info.mode = byteorder == MSBFirst ? ABGR8888 : RGBA8888; - if (rs == 8 && gs == 16 && bs == 24) + if ((rs == 8) && (gs == 16) && (bs == 24)) info.mode = byteorder == MSBFirst ? BGRA8888 : ARGB8888; - if (rs == 16 && gs == 8 && bs == 0) + if ((rs == 16) && (gs == 8) && (bs == 0)) info.mode = byteorder == MSBFirst ? ARGB8888 : BGRA8888; - if (rs == 24 && gs == 16 && bs == 8) + if ((rs == 24) && (gs == 16) && (bs == 8)) info.mode = byteorder == MSBFirst ? RGBA8888 : ABGR8888; } @@ -363,8 +363,8 @@ make_colormap(); /* identify code for MIT-SHM extension */ - if (XQueryExtension(display, "MIT-SHM", &major, &event, &error) && - XShmQueryExtension(display)) + if ((XQueryExtension(display, "MIT-SHM", &major, &event, &error)) && + (XShmQueryExtension(display))) info.shmcode = major; /* intercept errors looking for SHM code */ Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfextract.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfextract.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfextract.c (working copy) @@ -14,13 +14,13 @@ static int isimage(fz_obj *obj) { fz_obj *type = fz_dictgets(obj, "Subtype"); - return fz_isname(type) && !strcmp(fz_toname(type), "Image"); + return (fz_isname(type)) && (!strcmp(fz_toname(type), "Image")); } static int isfontdesc(fz_obj *obj) { fz_obj *type = fz_dictgets(obj, "Type"); - return fz_isname(type) && !strcmp(fz_toname(type), "FontDescriptor"); + return (fz_isname(type)) && (!strcmp(fz_toname(type), "FontDescriptor")); } static void saveimage(fz_obj *obj, int num, int gen) @@ -59,7 +59,7 @@ if (error) die(error); - if (bpc == 1 && n == 0) + if ((bpc == 1) && (n == 0)) { fz_pixmap *temp; @@ -81,7 +81,7 @@ pix = temp; } - if (img->super.cs && strcmp(img->super.cs->name, "DeviceRGB")) + if ((img->super.cs) && (strcmp(img->super.cs->name, "DeviceRGB"))) { fz_pixmap *temp; @@ -162,7 +162,7 @@ stream = obj; obj = fz_dictgets(obj, "Subtype"); - if (obj && !fz_isname(obj)) + if ((obj) && (!fz_isname(obj))) die(fz_throw("Invalid font descriptor subtype")); subtype = fz_toname(obj); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfinfo.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfinfo.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfinfo.c (working copy) @@ -141,7 +141,7 @@ psobj = nil; } - if (xref && xref->store) + if ((xref) && (xref->store)) { pdf_dropstore(xref->store); xref->store = nil; @@ -180,7 +180,7 @@ if (xref->info) { info->ref = fz_dictgets(xref->trailer, "Info"); - if (!fz_isdict(info->ref) && !fz_isindirect(info->ref)) + if ((!fz_isdict(info->ref)) && (!fz_isindirect(info->ref))) die(fz_throw("not an indirect info object")); info->u.info.obj = xref->info; @@ -196,7 +196,7 @@ if (xref->crypt) { cryptinfo->ref = fz_dictgets(xref->trailer, "Encrypt"); - if (!fz_isdict(cryptinfo->ref) && !fz_isindirect(cryptinfo->ref)) + if ((!fz_isdict(cryptinfo->ref)) && (!fz_isindirect(cryptinfo->ref))) die(fz_throw("not an indirect crypt object")); // XXX cryptinfo->u.crypt.obj = xref->crypt->encrypt; @@ -280,13 +280,13 @@ else { name = fz_dictgets(fontdict, "Name"); - if (name && !fz_isname(name)) + if ((name) && (!fz_isname(name))) return fz_throw("not a font dict name (%d %d R)", fz_tonum(ref), fz_togen(ref)); } for (k = 0; k < fonts; k++) - if (fz_tonum(font[k]->ref) == fz_tonum(ref) && - fz_togen(font[k]->ref) == fz_togen(ref)) + if ((fz_tonum(font[k]->ref) == fz_tonum(ref)) && + (fz_togen(font[k]->ref) == fz_togen(ref))) break; if (k < fonts) @@ -342,7 +342,7 @@ continue; filter = fz_dictgets(imagedict, "Filter"); - if (filter && !fz_isname(filter) && !fz_isarray(filter)) + if ((filter) && (!fz_isname(filter)) && (!fz_isarray(filter))) return fz_throw("not an image filter (%d %d R)", fz_tonum(ref), fz_togen(ref)); mask = fz_dictgets(imagedict, "ImageMask"); @@ -354,7 +354,7 @@ fz_obj *cses = cs; cs = fz_arrayget(cses, 0); - if (fz_isname(cs) && (!strcmp(fz_toname(cs), "DeviceN") || !strcmp(fz_toname(cs), "Separation"))) + if ((fz_isname(cs)) && ((!strcmp(fz_toname(cs), "DeviceN")) || (!strcmp(fz_toname(cs), "Separation")))) { altcs = fz_arrayget(cses, 2); if (fz_isarray(altcs)) @@ -362,14 +362,14 @@ } } - if (fz_isbool(mask) && fz_tobool(mask)) + if ((fz_isbool(mask)) && (fz_tobool(mask))) { if (cs) fz_warn("image mask (%d %d R) may not have colorspace", fz_tonum(ref), fz_togen(ref)); } - if (cs && !fz_isname(cs)) + if ((cs) && (!fz_isname(cs))) return fz_throw("not an image colorspace (%d %d R)", fz_tonum(ref), fz_togen(ref)); - if (altcs && !fz_isname(altcs)) + if ((altcs) && (!fz_isname(altcs))) return fz_throw("not an image alternate colorspace (%d %d R)", fz_tonum(ref), fz_togen(ref)); width = fz_dictgets(imagedict, "Width"); @@ -381,14 +381,14 @@ return fz_throw("not an image height (%d %d R)", fz_tonum(ref), fz_togen(ref)); bpc = fz_dictgets(imagedict, "BitsPerComponent"); - if (!fz_tobool(mask) && !fz_isint(bpc)) + if ((!fz_tobool(mask)) && (!fz_isint(bpc))) return fz_throw("not an image bits per component (%d %d R)", fz_tonum(ref), fz_togen(ref)); - if (fz_tobool(mask) && fz_isint(bpc) && fz_toint(bpc) != 1) + if ((fz_tobool(mask)) && (fz_isint(bpc)) && (fz_toint(bpc) != 1)) return fz_throw("not an image mask bits per component (%d %d R)", fz_tonum(ref), fz_togen(ref)); for (k = 0; k < images; k++) - if (fz_tonum(image[k]->ref) == fz_tonum(ref) && - fz_togen(image[k]->ref) == fz_togen(ref)) + if ((fz_tonum(image[k]->ref) == fz_tonum(ref)) && + (fz_togen(image[k]->ref) == fz_togen(ref))) break; if (k < images) @@ -444,22 +444,22 @@ continue; subtype = fz_dictgets(xobjdict, "Subtype2"); - if (subtype && !fz_isname(subtype)) + if ((subtype) && (!fz_isname(subtype))) return fz_throw("not a xobject subtype (%d %d R)", fz_tonum(ref), fz_togen(ref)); if (strcmp(fz_toname(subtype), "PS")) continue; group = fz_dictgets(xobjdict, "Group"); - if (group && !fz_isdict(group)) + if ((group) && (!fz_isdict(group))) return fz_throw("not a form xobject group dict (%d %d R)", fz_tonum(ref), fz_togen(ref)); reference = fz_dictgets(xobjdict, "Ref"); - if (reference && !fz_isdict(reference)) + if ((reference) && (!fz_isdict(reference))) return fz_throw("not a form xobject reference dict (%d %d R)", fz_tonum(ref), fz_togen(ref)); for (k = 0; k < forms; k++) - if (fz_tonum(form[k]->ref) == fz_tonum(ref) && - fz_togen(form[k]->ref) == fz_togen(ref)) + if ((fz_tonum(form[k]->ref) == fz_tonum(ref)) && + (fz_togen(form[k]->ref) == fz_togen(ref))) break; if (k < forms) @@ -509,15 +509,15 @@ continue; subtype = fz_dictgets(xobjdict, "Subtype2"); - if (subtype && !fz_isname(subtype)) + if ((subtype) && (!fz_isname(subtype))) return fz_throw("not a xobject subtype (%d %d R)", fz_tonum(ref), fz_togen(ref)); - if (strcmp(fz_toname(type), "PS") && - (strcmp(fz_toname(type), "Form") || strcmp(fz_toname(subtype), "PS"))) + if ((strcmp(fz_toname(type), "PS")) && + ((strcmp(fz_toname(type), "Form")) || (strcmp(fz_toname(subtype), "PS")))) continue; for (k = 0; k < psobjs; k++) - if (fz_tonum(psobj[k]->ref) == fz_tonum(ref) && - fz_togen(psobj[k]->ref) == fz_togen(ref)) + if ((fz_tonum(psobj[k]->ref) == fz_tonum(ref)) && + (fz_togen(psobj[k]->ref) == fz_togen(ref))) break; if (k < psobjs) @@ -558,15 +558,15 @@ return fz_throw("not a shading dict (%d %d R)", fz_tonum(ref), fz_togen(ref)); type = fz_dictgets(shade, "ShadingType"); - if (!fz_isint(type) || fz_toint(type) < 1 || fz_toint(type) > 7) + if ((!fz_isint(type)) || (fz_toint(type) < 1) || (fz_toint(type) > 7)) { fz_warn("not a shading type (%d %d R)", fz_tonum(ref), fz_togen(ref)); type = nil; } for (k = 0; k < shadings; k++) - if (fz_tonum(shading[k]->ref) == fz_tonum(ref) && - fz_togen(shading[k]->ref) == fz_togen(ref)) + if ((fz_tonum(shading[k]->ref) == fz_tonum(ref)) && + (fz_togen(shading[k]->ref) == fz_togen(ref))) break; if (k < shadings) @@ -610,7 +610,7 @@ return fz_throw("not a pattern dict (%d %d R)", fz_tonum(ref), fz_togen(ref)); type = fz_dictgets(patterndict, "PatternType"); - if (!fz_isint(type) || fz_toint(type) < 1 || fz_toint(type) > 2) + if ((!fz_isint(type)) || (fz_toint(type) < 1) || (fz_toint(type) > 2)) { fz_warn("not a pattern type (%d %d R)", fz_tonum(ref), fz_togen(ref)); type = nil; @@ -619,14 +619,14 @@ if (fz_toint(type) == 1) { paint = fz_dictgets(patterndict, "PaintType"); - if (!fz_isint(paint) || fz_toint(paint) < 1 || fz_toint(paint) > 2) + if ((!fz_isint(paint)) || (fz_toint(paint) < 1) || (fz_toint(paint) > 2)) { fz_warn("not a pattern paint type (%d %d R)", fz_tonum(ref), fz_togen(ref)); paint = nil; } tiling = fz_dictgets(patterndict, "TilingType"); - if (!fz_isint(tiling) || fz_toint(tiling) < 1 || fz_toint(tiling) > 3) + if ((!fz_isint(tiling)) || (fz_toint(tiling) < 1) || (fz_toint(tiling) > 3)) { fz_warn("not a pattern tiling type (%d %d R)", fz_tonum(ref), fz_togen(ref)); tiling = nil; @@ -634,8 +634,8 @@ } for (k = 0; k < patterns; k++) - if (fz_tonum(pattern[k]->ref) == fz_tonum(ref) && - fz_togen(pattern[k]->ref) == fz_togen(ref)) + if ((fz_tonum(pattern[k]->ref) == fz_tonum(ref)) && + (fz_togen(pattern[k]->ref) == fz_togen(ref))) break; if (k < patterns) @@ -698,7 +698,7 @@ } } - if (show & IMAGES || show & XOBJS) + if ((show & IMAGES) || (show & XOBJS)) { xobj = fz_dictgets(rsrc, "XObject"); if (xobj) @@ -766,7 +766,7 @@ #define PAGE_FMT "\t% 6d (% 6d %1d R): " - if (show & DIMENSIONS && dims > 0) + if ((show & DIMENSIONS) && (dims > 0)) { printf("MediaBox: "); printf("\n"); @@ -792,7 +792,7 @@ dims = 0; } - if (show & FONTS && fonts > 0) + if ((show & FONTS) && (fonts > 0)) { printf("Fonts (%d):\n", fonts); for (i = 0; i < fonts; i++) @@ -813,7 +813,7 @@ fonts = 0; } - if (show & IMAGES && images > 0) + if ((show & IMAGES) && (images > 0)) { printf("Images (%d):\n", images); for (i = 0; i < images; i++) @@ -852,7 +852,7 @@ images = 0; } - if (show & SHADINGS && shadings > 0) + if ((show & SHADINGS) && (shadings > 0)) { printf("Shading patterns (%d):\n", shadings); for (i = 0; i < shadings; i++) @@ -884,7 +884,7 @@ shadings = 0; } - if (show & PATTERNS && patterns > 0) + if ((show & PATTERNS) && (patterns > 0)) { printf("Patterns (%d):\n", patterns); for (i = 0; i < patterns; i++) @@ -926,7 +926,7 @@ patterns = 0; } - if (show & XOBJS && forms > 0) + if ((show & XOBJS) && (forms > 0)) { printf("Form xobjects (%d):\n", forms); for (i = 0; i < forms; i++) @@ -947,7 +947,7 @@ forms = 0; } - if (show & XOBJS && psobjs > 0) + if ((show & XOBJS) && (psobjs > 0)) { printf("Postscript xobjects (%d):\n", psobjs); for (i = 0; i < psobjs; i++) @@ -1063,7 +1063,7 @@ state = NO_FILE_OPENED; while (fz_optind < argc) { - if (strstr(argv[fz_optind], ".pdf") || strstr(argv[fz_optind], ".PDF")) + if ((strstr(argv[fz_optind], ".pdf")) || (strstr(argv[fz_optind], ".PDF"))) { if (state == NO_INFO_GATHERED) { Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/mozilla/moz_main.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/mozilla/moz_main.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/mozilla/moz_main.c (working copy) @@ -193,7 +193,7 @@ moz->scrollyofs = 0; for (i = 0; i < moz->pagecount; i++) { - if (spos >= y && spos < y + moz->pages[i].px) + if ((spos >= y) && (spos < y + moz->pages[i].px)) { moz->scrollpage = i; moz->scrollyofs = spos - y; @@ -299,7 +299,7 @@ { if (!moz->pages[pi].image) return; - if (y > py && y < moz->pages[pi].px) + if ((y > py) && (y < moz->pages[pi].px)) break; py += moz->pages[pi].px; pi ++; @@ -317,8 +317,8 @@ for (link = moz->pages[pi].page->links; link; link = link->next) { - if (p.x >= link->rect.x0 && p.x <= link->rect.x1) - if (p.y >= link->rect.y0 && p.y <= link->rect.y1) + if ((p.x >= link->rect.x0) && (p.x <= link->rect.x1)) + if ((p.y >= link->rect.y0) && (p.y <= link->rect.y1)) break; } @@ -457,7 +457,7 @@ /* evict out-of-range images and pages */ for (i = 0; i < moz->pagecount; i++) { - if (i < moz->scrollpage - 2 || i > moz->scrollpage + 6) + if ((i < moz->scrollpage - 2) || (i > moz->scrollpage + 6)) { if (moz->pages[i].page) { @@ -465,7 +465,7 @@ moz->pages[i].page = nil; } } - if (i < moz->scrollpage - 1 || i > moz->scrollpage + 3) + if ((i < moz->scrollpage - 1) || (i > moz->scrollpage + 3)) { if (moz->pages[i].image) { @@ -484,7 +484,7 @@ if (moz->error[0]) return 0; y = -moz->scrollyofs; - while (y < h && i < moz->pagecount) + while ((y < h) && (i < moz->pagecount)) { pdfmoz_loadpage(moz, i); if (moz->error[0]) return 0; @@ -501,7 +501,7 @@ i = moz->scrollpage; y = -moz->scrollyofs; - while (y < h && i < moz->pagecount) + while ((y < h) && (i < moz->pagecount)) { drawimage(hdc, moz, moz->pages[i].image, y); y += moz->pages[i].image->h; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/common/pdftool.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/common/pdftool.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/common/pdftool.c (working copy) @@ -49,9 +49,9 @@ if (pdf_needspassword(xref)) { okay = pdf_authenticatepassword(xref, password); - if (!okay && !dieonbadpass) + if ((!okay) && (!dieonbadpass)) fz_warn("invalid password, attempting to continue."); - else if (!okay && dieonbadpass) + else if ((!okay) && (dieonbadpass)) die(fz_throw("invalid password")); } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/common/pdfapp.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/common/pdfapp.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/common/pdfapp.c (working copy) @@ -213,7 +213,7 @@ if (app->winh >= app->image->h) newy = (app->winh - app->image->h) / 2; - if (newx != app->panx || newy != app->pany) + if ((newx != app->panx) || (newy != app->pany)) winrepaint(app); app->panx = newx; @@ -281,7 +281,7 @@ w = app->scrw * 90 / 100; if (h > app->scrh * 90 / 100) h = app->scrh * 90 / 100; - if (w != app->winw || h != app->winh) + if ((w != app->winw) || (h != app->winh)) winresize(app, w, h); } @@ -318,7 +318,7 @@ void pdfapp_onresize(pdfapp_t *app, int w, int h) { - if (app->winw != w || app->winh != h) + if ((app->winw != w) || (app->winh != h)) { app->winw = w; app->winh = h; @@ -336,7 +336,7 @@ * Save numbers typed for later */ - if (c >= '0' && c <= '9') + if ((c >= '0') && (c <= '9')) { app->number[app->numberlen++] = c; app->number[app->numberlen] = '\0'; @@ -485,7 +485,7 @@ panto = PAN_TO_TOP; app->pageno += 10; break; } - if (c < '0' || c > '9') + if ((c < '0') || (c > '9')) app->numberlen = 0; if (app->pageno < 1) @@ -521,15 +521,15 @@ for (link = app->page->links; link; link = link->next) { - if (p.x >= link->rect.x0 && p.x <= link->rect.x1) - if (p.y >= link->rect.y0 && p.y <= link->rect.y1) + if ((p.x >= link->rect.x0) && (p.x <= link->rect.x1)) + if ((p.y >= link->rect.y0) && (p.y <= link->rect.y1)) break; } if (link) { wincursor(app, HAND); - if (btn == 1 && state == 1) + if ((btn == 1) && (state == 1)) { if (link->kind == PDF_LURI) pdfapp_gotouri(app, link->dest); @@ -545,13 +545,13 @@ if (state == 1) { - if (btn == 1 && !app->iscopying) + if ((btn == 1) && (!app->iscopying)) { app->ispanning = 1; app->selx = x; app->sely = y; } - if (btn == 3 && !app->ispanning) + if ((btn == 3) && (!app->ispanning)) { app->iscopying = 1; app->selx = x; @@ -561,7 +561,7 @@ app->selr.y0 = y; app->selr.y1 = y; } - if (btn == 4 || btn == 5) /* scroll wheel */ + if ((btn == 4) || (btn == 5)) /* scroll wheel */ { int dir = btn == 4 ? 1 : -1; app->ispanning = app->iscopying = 0; @@ -597,7 +597,7 @@ app->selr.y0 = MIN(app->sely, y); app->selr.y1 = MAX(app->sely, y); winrepaint(app); - if (app->selr.x0 < app->selr.x1 && app->selr.y0 < app->selr.y1) + if ((app->selr.x0 < app->selr.x1) && (app->selr.y0 < app->selr.y1)) windocopy(app); } if (app->ispanning) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfdraw.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfdraw.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfdraw.c (working copy) @@ -39,7 +39,7 @@ static void local_cleanup(void) { - if (xref && xref->store) + if ((xref) && (xref->store)) { pdf_dropstore(xref->store); xref->store = nil; @@ -87,7 +87,7 @@ long elapsed; fprintf(stderr, "draw %s:%03d ", basename, pagenum); - if (benchmark && loadtimes) + if ((benchmark) && (loadtimes)) { fflush(stderr); gettime(&start); @@ -98,7 +98,7 @@ if (error) die(error); - if (benchmark && loadtimes) + if ((benchmark) && (loadtimes)) { gettime(&end); elapsed = end - start; @@ -131,7 +131,7 @@ /* Flush resources between pages. * TODO: should check memory usage before deciding to do this. */ - if (xref && xref->store) + if ((xref) && (xref->store)) { /* pdf_debugstore(xref->store); */ pdf_agestoreditems(xref->store); @@ -403,7 +403,7 @@ state = NO_FILE_OPENED; while (fz_optind < argc) { - if (strstr(argv[fz_optind], ".pdf") || strstr(argv[fz_optind], ".PDF")) + if ((strstr(argv[fz_optind], ".pdf")) || (strstr(argv[fz_optind], ".PDF"))) { if (state == NO_PAGES_DRAWN) drawpages("1-"); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/windows/winmain.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/windows/winmain.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/windows/winmain.c (working copy) @@ -295,7 +295,7 @@ wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = "FrameWindow"; - assert(RegisterClass(&wc) && "Register window class"); + assert((RegisterClass(&wc)) && ("Register window class")); /* Create and register window view class */ wc.style = CS_HREDRAW | CS_VREDRAW; @@ -308,7 +308,7 @@ wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = "ViewWindow"; - assert(RegisterClass(&wc) && "Register window class"); + assert((RegisterClass(&wc)) && ("Register window class")); /* Get screen size */ SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0); @@ -386,7 +386,7 @@ dp = wide; sp = title; - while (*sp && dp < wide + 255) + while ((*sp) && (dp < wide + 255)) { sp += chartorune(&rune, sp); *dp++ = rune; @@ -460,7 +460,7 @@ if (bmpdata) { - if (gapp.iscopying || justcopied) + if ((gapp.iscopying) || (justcopied)) invertcopyrect(); dibinf->bmiHeader.biWidth = gapp.image->w; @@ -480,7 +480,7 @@ DIB_RGB_COLORS /* color use flag */ ); - if (gapp.iscopying || justcopied) + if ((gapp.iscopying) || (justcopied)) invertcopyrect(); } @@ -584,7 +584,7 @@ if (c == 'q') exit(0); - else if (c == '?' || c == 'h') + else if ((c == '?') || (c == 'h')) help(); else pdfapp_onkey(&gapp, c); @@ -592,7 +592,7 @@ void handlemouse(int x, int y, int btn, int state) { - if (state != 0 && justcopied) + if ((state != 0) && (justcopied)) { justcopied = 0; winrepaint(&gapp); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfshow.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfshow.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfshow.c (working copy) @@ -38,11 +38,11 @@ { int i; for (i = 0; i < n; i++) { - if (buf[i] == '\r' || buf[i] == '\n') { + if ((buf[i] == '\r') || (buf[i] == '\n')) { putchar('\n'); showcolumn = 0; } - else if (buf[i] < 32 || buf[i] > 126) { + else if ((buf[i] < 32) || (buf[i] > 126)) { putchar('.'); showcolumn ++; } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfclean.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfclean.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/apps/pdfclean.c (working copy) @@ -65,7 +65,7 @@ oid = fz_tonum(ref); gen = fz_tonum(ref); - if (oid < 0 || oid >= xref->len) + if ((oid < 0) || (oid >= xref->len)) return fz_throw("object out of range (%d %d R)", oid, gen); if (uselist[oid]) @@ -175,13 +175,13 @@ if (fz_isdict(obj)) { type = fz_dictgets(obj, "Type"); - if (fz_isname(type) && !strcmp(fz_toname(type), "ObjStm")) + if ((fz_isname(type)) && (!strcmp(fz_toname(type), "ObjStm"))) { uselist[oid] = 0; fz_dropobj(obj); return; } - if (fz_isname(type) && !strcmp(fz_toname(type), "XRef")) + if ((fz_isname(type)) && (!strcmp(fz_toname(type), "XRef"))) { uselist[oid] = 0; fz_dropobj(obj); @@ -329,10 +329,10 @@ if (xref->table[oid].type == 'o') genlist[oid] = 0; - if (dogarbage && !uselist[oid]) + if ((dogarbage) && (!uselist[oid])) continue; - if (xref->table[oid].type == 'n' || xref->table[oid].type == 'o') + if ((xref->table[oid].type == 'n') || (xref->table[oid].type == 'o')) { ofslist[oid] = ftell(out); saveobject(oid, genlist[oid]); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathscan.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathscan.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathscan.c (working copy) @@ -228,7 +228,7 @@ t = a[i]; k = i - h; /* TODO: sort on y major, x minor */ - while (k >= 0 && a[k].y > t.y) { + while ((k >= 0) && (a[k].y > t.y)) { a[k + h] = a[k]; k -= h; } @@ -292,7 +292,7 @@ for (i = 0; i < n; i++) { t = a[i]; k = i - h; - while (k >= 0 && a[k]->x > t->x) { + while ((k >= 0) && (a[k]->x > t->x)) { a[k + h] = a[k]; k -= h; } @@ -307,7 +307,7 @@ insertael(fz_ael *ael, fz_gel *gel, int y, int *e) { /* insert edges that start here */ - while (*e < gel->len && gel->edges[*e].y == y) { + while ((*e < gel->len) && (gel->edges[*e].y == y)) { if (ael->len + 1 == ael->cap) { int newcap = ael->cap + 64; fz_edge **newedges = fz_realloc(ael->edges, sizeof(fz_edge*) * newcap); @@ -399,9 +399,9 @@ int i; for (i = 0; i < ael->len; i++) { - if (!winding && (winding + ael->edges[i]->ydir)) + if ((!winding) && (winding + ael->edges[i]->ydir)) x = ael->edges[i]->x; - if (winding && !(winding + ael->edges[i]->ydir)) + if ((winding) && (!(winding + ael->edges[i]->ydir))) addspan(list, x, ael->edges[i]->x, xofs); winding += ael->edges[i]->ydir; } @@ -492,12 +492,12 @@ yc = fz_idiv(y, VSCALE); yd = yc; - while (ael->len > 0 || e < gel->len) + while ((ael->len > 0) || (e < gel->len)) { yc = fz_idiv(y, VSCALE); if (yc != yd) { - if (yd >= clip.y0 && yd < clip.y1) + if ((yd >= clip.y0) && (yd < clip.y1)) { blit(pix, xmin + skipx, yd, deltas, skipx, clipn, argb, over); } @@ -510,7 +510,7 @@ return error; } - if (yd >= clip.y0 && yd < clip.y1) + if ((yd >= clip.y0) && (yd < clip.y1)) { if (eofill) evenodd(ael, deltas, xofs); @@ -526,7 +526,7 @@ y = gel->edges[e].y; } - if (yd >= clip.y0 && yd < clip.y1) + if ((yd >= clip.y0) && (yd < clip.y1)) { blit(pix, xmin + skipx, yd, deltas, skipx, clipn, argb, over); } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathfill.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathfill.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathfill.c (working copy) @@ -83,7 +83,7 @@ { case FZ_MOVETO: /* implicit closepath before moveto */ - if (i && (cx != bx || cy != by)) + if ((i) && ((cx != bx) || (cy != by))) { error = line(gel, &ctm, cx, cy, bx, by); if (error) @@ -130,7 +130,7 @@ } } - if (i && (cx != bx || cy != by)) + if ((i) && ((cx != bx) || (cy != by))) { error = line(gel, &ctm, cx, cy, bx, by); if (error) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/glyphcache.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/glyphcache.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/glyphcache.c (working copy) @@ -258,7 +258,7 @@ { fz_val tmp; - if (i == 0 || arena->load < 2) + if ((i == 0) || (arena->load < 2)) return; tmp = arena->lru[i - 1]; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/meshdraw.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/meshdraw.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/meshdraw.c (working copy) @@ -358,7 +358,7 @@ p.x = shade->mesh[(i * 3 + k) * n + 0]; p.y = shade->mesh[(i * 3 + k) * n + 1]; p = fz_transformpoint(ctm, p); - if (isnan(p.y) || isnan(p.x)) // How is this happening? + if ((isnan(p.y)) || (isnan(p.x))) // How is this happening? goto baddata; tri[k][0] = p.x; tri[k][1] = p.y; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/render.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/render.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/render.c (working copy) @@ -271,8 +271,8 @@ int sx1 = src->w; int sy1 = src->h; - if (x1 <= dx0 || x0 >= dx1) return; - if (y1 <= dy0 || y0 >= dy1) return; + if ((x1 <= dx0) || (x0 >= dx1)) return; + if ((y1 <= dy0) || (y0 >= dy1)) return; if (x0 < dx0) { sx0 += dx0 - x0; x0 = dx0; } if (y0 < dy0) { sy0 += dy0 - y0; y0 = dy0; } if (x1 > dx1) { sx1 += dx1 - x1; x1 = dx1; } @@ -372,12 +372,12 @@ sx = sqrt(ctm.a * ctm.a + ctm.b * ctm.b); dx = 1; - while (((w+dx-1)/dx)/sx > 2.0 && (w+dx-1)/dx > 1) + while ((((w+dx-1)/dx)/sx > 2.0) && ((w+dx-1)/dx > 1)) dx++; sy = sqrt(ctm.c * ctm.c + ctm.d * ctm.d); dy = 1; - while (((h+dy-1)/dy)/sy > 2.0 && (h+dy-1)/dy > 1) + while ((((h+dy-1)/dy)/sy > 2.0) && ((h+dy-1)/dy > 1)) dy++; *odx = dx; @@ -409,7 +409,7 @@ if (fz_isemptyrect(clip)) return fz_okay; - if (image->w == 0 || image->h == 0) + if ((image->w == 0) || (image->h == 0)) return fz_okay; calcimagescale(ctm, image->w, image->h, &dx, &dy); @@ -419,7 +419,7 @@ /* tileheight must be an even multiple of dy, except for last band */ tileheight = (tileheight + dy - 1) / dy * dy; - if ((dx != 1 || dy != 1) && image->h > tileheight) { + if (((dx != 1) || (dy != 1)) && (image->h > tileheight)) { int y = 0; DEBUG(" load image tile size = %dx%d\n", image->w, tileheight); @@ -465,7 +465,7 @@ if (error) goto cleanup; - if (dx != 1 || dy != 1) + if ((dx != 1) || (dy != 1)) { DEBUG(" scale image 1/%d 1/%d\n", dx, dy); error = fz_scalepixmap(&temp, tile, dx, dy); @@ -476,7 +476,7 @@ } } - if (image->cs && image->cs != gc->model) + if ((image->cs) && (image->cs != gc->model)) { DEBUG(" convert from %s to %s\n", image->cs->name, gc->model->name); error = fz_newpixmap(&temp, tile->x, tile->y, tile->w, tile->h, gc->model->n + 1); @@ -617,9 +617,9 @@ sp = src->samples + ((y - src->y) * src->w + (x - src->x)) * src->n; dp = dst->samples + ((y - dst->y) * dst->w + (x - dst->x)) * dst->n; - if (src->n == 1 && dst->n == 1) + if ((src->n == 1) && (dst->n == 1)) fz_duff_1o1(sp, src->w, dp, dst->w, w, h); - else if (src->n == 4 && dst->n == 4) + else if ((src->n == 4) && (dst->n == 4)) fz_duff_4o4(sp, src->w * 4, dp, dst->w * 4, w, h); else if (src->n == dst->n) fz_duff_non(sp, src->w * src->n, src->n, dp, dst->w * dst->n, w, h); @@ -662,9 +662,9 @@ if (over) { - if (src->n == 1 && msk->n == 1 && dst->n == 1) + if ((src->n == 1) && (msk->n == 1) && (dst->n == 1)) fz_duff_1i1o1(sp, src->w, mp, msk->w, dp, dst->w, w, h); - else if (src->n == 4 && msk->n == 1 && dst->n == 4) + else if ((src->n == 4) && (msk->n == 1) && (dst->n == 4)) fz_duff_4i1o4(sp, src->w * 4, mp, msk->w, dp, dst->w * 4, w, h); else if (src->n == dst->n) fz_duff_nimon(sp, src->w * src->n, src->n, mp, msk->w * msk->n, msk->n, dp, dst->w * dst->n, w, h); @@ -673,9 +673,9 @@ } else { - if (src->n == 1 && msk->n == 1 && dst->n == 1) + if ((src->n == 1) && (msk->n == 1) && (dst->n == 1)) fz_duff_1i1c1(sp, src->w, mp, msk->w, dp, dst->w, w, h); - else if (src->n == 4 && msk->n == 1 && dst->n == 4) + else if ((src->n == 4) && (msk->n == 1) && (dst->n == 4)) fz_duff_4i1c4(sp, src->w * 4, mp, msk->w, dp, dst->w * 4, w, h); else if (src->n == dst->n) fz_duff_nimcn(sp, src->w * src->n, src->n, mp, msk->w * msk->n, msk->n, dp, dst->w * dst->n, w, h); @@ -790,8 +790,8 @@ { fz_irect sbox = fz_roundrect(fz_boundnode(shape, ctm)); fz_irect cbox = fz_roundrect(fz_boundnode(color, ctm)); - if (cbox.x0 >= sbox.x0 && cbox.x1 <= sbox.x1) - if (cbox.y0 >= sbox.y0 && cbox.y1 <= sbox.y1) + if ((cbox.x0 >= sbox.x0) && (cbox.x1 <= sbox.x1)) + if ((cbox.y0 >= sbox.y0) && (cbox.y1 <= sbox.y1)) DEBUG("potentially useless mask\n"); } @@ -818,7 +818,7 @@ gc->clip = oldclip; gc->over = oldover; - if (shapepix && colorpix) + if ((shapepix) && (colorpix)) { if (gc->over) { Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/imageunpack.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/imageunpack.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/imageunpack.c (working copy) @@ -30,7 +30,7 @@ max[i] = decode[(i - skip) * 2 + 1] * 255; sub[i] = max[i] - min[i]; needed |= (min[i] != 0) | (max[i] != 255); - justinvert &= min[i] == 255 && max[i] == 0 && sub[i] == -255; + justinvert &= (min[i] == 255) && (max[i] == 0) && (sub[i] == -255); } if (!needed) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathstroke.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathstroke.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/pathstroke.c (working copy) @@ -150,7 +150,7 @@ dmy = (dly0 + dly1) * 0.5; dmr2 = dmx * dmx + dmy * dmy; - if (cross * cross < FLT_EPSILON && dx0 * dx1 + dy0 * dy1 >= 0) + if ((cross * cross < FLT_EPSILON) && (dx0 * dx1 + dy0 * dy1 >= 0)) linejoin = BEVEL; if (linejoin == MITER) @@ -382,7 +382,7 @@ error = strokelineto(s, s->beg[0]); if (error) return error; - if (s->seg[1].x == s->beg[0].x && s->seg[1].y == s->beg[0].y) + if ((s->seg[1].x == s->beg[0].x) && (s->seg[1].y == s->beg[0].y)) error = linejoin(s, s->seg[0], s->beg[0], s->beg[1]); else error = linejoin(s, s->seg[1], s->beg[0], s->beg[1]); @@ -483,7 +483,7 @@ i = 0; - if (path->len > 0 && path->els[0].k != FZ_MOVETO) + if ((path->len > 0) && (path->els[0].k != FZ_MOVETO)) return fz_throw("path must begin with moveto"); p0.x = p0.y = 0; /* FZ_MOVETO guarantees p0 to be set, silence compiler */ @@ -688,7 +688,7 @@ i = 0; - if (path->len > 0 && path->els[0].k != FZ_MOVETO) + if ((path->len > 0) && (path->els[0].k != FZ_MOVETO)) return fz_throw("path must begin with moveto"); p0.x = p0.y = 0; /* FZ_MOVETO guarantees p0 to be set, silence compiler */ Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/imagescale.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/imagescale.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitzdraw/imagescale.c (working copy) @@ -208,7 +208,7 @@ assert(xoffs == 0); /* don't handle stride properly yet */ assert(dst->n == n); - assert(dst->w >= xoffs + ow && dst->h >= yoffs + oh); + assert((dst->w >= xoffs + ow) && (dst->h >= yoffs + oh)); buf = fz_malloc(ow * n * ydenom); if (!buf) @@ -223,7 +223,7 @@ } dstsamples = dst->samples + (yoffs * dst->w + xoffs)*dst->n; - if (srowx && scolx) + if ((srowx) && (scolx)) { for (y = 0, oy = 0; y < (src->h / ydenom) * ydenom; y += ydenom, oy++) { @@ -315,7 +315,7 @@ case 5: srowx = fz_srow5; scolx = fz_scol5; break; } - if (srowx && scolx) + if ((srowx) && (scolx)) { for (y = 0, oy = 0; y < (src->h / ydenom) * ydenom; y += ydenom, oy++) { Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_shade1.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_shade1.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_shade1.c (working copy) @@ -276,7 +276,7 @@ else theta = 0; - if (!(theta >= 0 && theta <= M_PI)) + if (!((theta >= 0) && (theta <= M_PI))) theta = 0; step = M_PI * 2. / (float)MAX_RAD_SEGS; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_shade4.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_shade4.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_shade4.c (working copy) @@ -123,7 +123,7 @@ { j += n; } - if (flag == 1 || flag == 2) + if ((flag == 1) || (flag == 2)) { j += 3 * n; } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_colorspace1.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_colorspace1.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_colorspace1.c (working copy) @@ -562,7 +562,7 @@ n = base->n * (cs->high + 1); cs->lookup = fz_malloc(n); - if (fz_isstring(lookup) && fz_tostrlen(lookup) == n) + if ((fz_isstring(lookup)) && (fz_tostrlen(lookup) == n)) { unsigned char *buf; int i; @@ -587,7 +587,7 @@ return fz_rethrow(error, "cannot load colorpsace lookup table"); } - for (i = 0; i < n && i < (buf->wp - buf->rp); i++) + for (i = 0; (i < n) && (i < (buf->wp - buf->rp)); i++) cs->lookup[i] = buf->rp[i]; fz_dropbuffer(buf); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_annot.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_annot.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_annot.c (working copy) @@ -25,7 +25,7 @@ static fz_obj * resolvedest(pdf_xref *xref, fz_obj *dest) { - if (fz_isname(dest) || fz_isstring(dest)) + if ((fz_isname(dest)) || (fz_isstring(dest))) { dest = pdf_lookupdest(xref, dest); return resolvedest(xref, dest); @@ -84,13 +84,13 @@ if (action) { obj = fz_dictgets(action, "S"); - if (fz_isname(obj) && !strcmp(fz_toname(obj), "GoTo")) + if ((fz_isname(obj)) && (!strcmp(fz_toname(obj), "GoTo"))) { kind = PDF_LGOTO; dest = resolvedest(xref, fz_dictgets(action, "D")); pdf_logpage("action goto (%d %d R)\n", fz_tonum(dest), fz_togen(dest)); } - else if (fz_isname(obj) && !strcmp(fz_toname(obj), "URI")) + else if ((fz_isname(obj)) && (!strcmp(fz_toname(obj), "URI"))) { kind = PDF_LURI; dest = fz_dictgets(action, "URI"); @@ -132,7 +132,7 @@ obj = fz_arrayget(annots, i); subtype = fz_dictgets(obj, "Subtype"); - if (fz_isname(subtype) && !strcmp(fz_toname(subtype), "Link")) + if ((fz_isname(subtype)) && (!strcmp(fz_toname(subtype), "Link"))) { pdf_link *temp = pdf_loadlink(xref, obj); if (temp) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_cmap.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_cmap.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_cmap.c (working copy) @@ -289,21 +289,21 @@ if (a->high - a->low + a->offset + 1 == b->offset) { /* SR -> R and SS -> R and RR -> R and RS -> R */ - if (a->flag == PDF_CMAP_SINGLE || a->flag == PDF_CMAP_RANGE) + if ((a->flag == PDF_CMAP_SINGLE) || (a->flag == PDF_CMAP_RANGE)) { a->flag = PDF_CMAP_RANGE; a->high = b->high; } /* LS -> L */ - else if (a->flag == PDF_CMAP_TABLE && b->flag == PDF_CMAP_SINGLE) + else if ((a->flag == PDF_CMAP_TABLE) && (b->flag == PDF_CMAP_SINGLE)) { a->high = b->high; addtable(cmap, b->offset); } /* LR -> LR */ - else if (a->flag == PDF_CMAP_TABLE && b->flag == PDF_CMAP_RANGE) + else if ((a->flag == PDF_CMAP_TABLE) && (b->flag == PDF_CMAP_RANGE)) { *(++a) = *b; } @@ -319,7 +319,7 @@ else { /* SS -> L */ - if (a->flag == PDF_CMAP_SINGLE && b->flag == PDF_CMAP_SINGLE) + if ((a->flag == PDF_CMAP_SINGLE) && (b->flag == PDF_CMAP_SINGLE)) { a->flag = PDF_CMAP_TABLE; a->high = b->high; @@ -329,7 +329,7 @@ } /* LS -> L */ - else if (a->flag == PDF_CMAP_TABLE && b->flag == PDF_CMAP_SINGLE) + else if ((a->flag == PDF_CMAP_TABLE) && (b->flag == PDF_CMAP_SINGLE)) { a->high = b->high; addtable(cmap, b->offset); @@ -404,7 +404,7 @@ { if (cmap->cspace[k].n == n + 1) { - if (c >= cmap->cspace[k].low && c <= cmap->cspace[k].high) + if ((c >= cmap->cspace[k].low) && (c <= cmap->cspace[k].high)) { *cpt = c; return buf + n + 1; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_image.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_image.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_image.c (working copy) @@ -144,7 +144,7 @@ /* load image data */ f = fz_dictgetsa(dict, "Filter", "F"); - if (!f || (fz_isarray(f) && fz_arraylen(f) == 0)) + if ((!f) || ((fz_isarray(f)) && (fz_arraylen(f) == 0))) { img->samples = fz_newbuffer(img->super.h * img->stride); @@ -291,7 +291,7 @@ fz_dropcolorspace(cs); cs = nil; } - if (bpc != 0 && bpc != 1) + if ((bpc != 0) && (bpc != 1)) fz_warn("masks can only have one component, proceeding anyway."); bpc = 1; @@ -315,7 +315,7 @@ if (error) return error; - if (mask->super.cs && mask->super.cs != pdf_devicegray) + if ((mask->super.cs) && (mask->super.cs != pdf_devicegray)) return fz_throw("syntaxerror: SMask must be DeviceGray"); mask->super.cs = nil; @@ -452,7 +452,7 @@ { t = 1; for (k = 1; k < pix->n; k++) - if (p[k] < colorkey[k * 2 - 2] || p[k] > colorkey[k * 2 - 1]) + if ((p[k] < colorkey[k * 2 - 2]) || (p[k] > colorkey[k * 2 - 1])) t = 0; if (t) for (k = 0; k < pix->n; k++) @@ -470,7 +470,7 @@ for (i = 0; i < pix->w * pix->h; i++) { - if (s[0] >= colorkey[0] && s[0] <= colorkey[1]) + if ((s[0] >= colorkey[0]) && (s[0] <= colorkey[1])) for (k = 0; k < pix->n; k++) d[k] = 0; s += ind->n; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_repair.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_repair.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_repair.c (working copy) @@ -42,7 +42,7 @@ return fz_rethrow(error, "cannot parse object"); obj = fz_dictgets(dict, "Type"); - if (fz_isname(obj) && !strcmp(fz_toname(obj), "Catalog")) + if ((fz_isname(obj)) && (!strcmp(fz_toname(obj), "Catalog"))) *isroot = 1; if (fz_dictgets(dict, "Producer")) @@ -55,7 +55,7 @@ stmlen = fz_toint(obj); obj = fz_dictgets(dict, "Filter"); - if (fz_isname(obj) && !strcmp(fz_toname(obj), "Standard")) + if ((fz_isname(obj)) && (!strcmp(fz_toname(obj), "Standard"))) { fz_dropobj(dict); return fz_throw("cannot repair encrypted files"); @@ -64,10 +64,10 @@ fz_dropobj(dict); } - while ( tok != PDF_TSTREAM && - tok != PDF_TENDOBJ && - tok != PDF_TERROR && - tok != PDF_TEOF ) + while ( (tok != PDF_TSTREAM) && + (tok != PDF_TENDOBJ) && + (tok != PDF_TERROR) && + (tok != PDF_TEOF) ) { error = pdf_lex(&tok, file, buf, cap, &len); if (error) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_unicode.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_unicode.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_unicode.c (working copy) @@ -106,7 +106,7 @@ return fz_okay; } - if (!font->tounicode && !font->cidtoucs) + if ((!font->tounicode) && (!font->cidtoucs)) { pdf_logfont("tounicode could not be loaded\n"); /* TODO: synthesize a ToUnicode if it's a freetype font with Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_open.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_open.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_open.c (working copy) @@ -4,8 +4,8 @@ static inline int iswhite(int ch) { return - ch == '\000' || ch == '\011' || ch == '\012' || - ch == '\014' || ch == '\015' || ch == '\040'; + (ch == '\000') || (ch == '\011') || (ch == '\012') || + (ch == '\014') || (ch == '\015') || (ch == '\040'); } /* @@ -61,7 +61,7 @@ if (memcmp(buf + i, "startxref", 9) == 0) { i += 9; - while (iswhite(buf[i]) && i < n) + while ((iswhite(buf[i])) && (i < n)) i ++; xref->startxref = atoi((char*)(buf + i)); return fz_okay; @@ -97,7 +97,7 @@ while (1) { c = fz_peekbyte(xref->file); - if (!(c >= '0' && c <= '9')) + if (!((c >= '0') && (c <= '9'))) break; error = fz_readline(xref->file, buf, cap); @@ -111,7 +111,7 @@ len = atoi(strsep(&s, " ")); /* broken pdfs where the section is not on a separate line */ - if (s && *s != '\0') + if ((s) && (*s != '\0')) { error = fz_seek(xref->file, -(2 + strlen(s)), 1); if (error) @@ -186,7 +186,7 @@ if (error) return fz_rethrow(error, "cannot read trailer"); } - else if (c >= '0' && c <= '9') + else if ((c >= '0') && (c <= '9')) { error = readnewtrailer(xref, buf, cap); if (error) @@ -226,7 +226,7 @@ while (1) { c = fz_peekbyte(xref->file); - if (!(c >= '0' && c <= '9')) + if (!((c >= '0') && (c <= '9'))) break; error = fz_readline(xref->file, buf, cap); @@ -238,7 +238,7 @@ len = atoi(strsep(&s, " ")); /* broken pdfs where the section is not on a separate line */ - if (s && *s != '\0') + if ((s) && (*s != '\0')) { fz_warn("broken xref section. proceeding anyway."); error = fz_seek(xref->file, -(2 + strlen(s)), 1); @@ -278,7 +278,7 @@ s = buf; /* broken pdfs where line start with white space */ - while (*s != '\0' && iswhite(*s)) + while ((*s != '\0') && (iswhite(*s))) s++; xref->table[ofs + i].ofs = atoi(s); @@ -312,7 +312,7 @@ fz_error error; int i, n; - if (i0 < 0 || i0 + i1 > xref->len) + if ((i0 < 0) || (i0 + i1 > xref->len)) return fz_throw("xref stream has too many entries"); for (i = i0; i < i0 + i1; i++) @@ -398,9 +398,9 @@ xref->len = size; } - if (oid < 0 || oid >= xref->len) + if ((oid < 0) || (oid >= xref->len)) { - if (oid == xref->len && oid < xref->cap) + if ((oid == xref->len) && (oid < xref->cap)) { /* allow broken pdf files that have off-by-one errors in the xref */ fz_warn("object id (%d %d R) out of range (0..%d)", oid, gen, xref->len - 1); @@ -494,7 +494,7 @@ if (error) return fz_rethrow(error, "cannot read xref (ofs=%d)", ofs); } - else if (c >= '0' && c <= '9') + else if ((c >= '0') && (c <= '9')) { error = readnewxref(trailerp, xref, buf, cap); if (error) @@ -592,7 +592,7 @@ for (i = 0; i < count; i++) { error = pdf_lex(&tok, stm, buf, cap, &n); - if (error || tok != PDF_TINT) + if ((error) || (tok != PDF_TINT)) { error = fz_rethrow(error, "corrupt object stream"); goto cleanupstm; @@ -600,7 +600,7 @@ oidbuf[i] = atoi(buf); error = pdf_lex(&tok, stm, buf, cap, &n); - if (error || tok != PDF_TINT) + if ((error) || (tok != PDF_TINT)) { error = fz_rethrow(error, "corrupt object stream"); goto cleanupstm; @@ -626,7 +626,7 @@ goto cleanupstm; } - if (oidbuf[i] < 1 || oidbuf[i] >= xref->len) + if ((oidbuf[i] < 1) || (oidbuf[i] >= xref->len)) { fz_dropobj(obj); error = fz_throw("object id (%d 0 R) out of range (0..%d)", oidbuf[i], xref->len - 1); @@ -735,8 +735,8 @@ /* broken pdfs where freed objects have offset and gen set to 0 but still exits */ for (i = 0; i < xref->len; i++) - if (xref->table[i].type == 'n' && xref->table[i].ofs == 0 && - xref->table[i].gen == 0 && xref->table[i].obj == nil) + if ((xref->table[i].type == 'n') && (xref->table[i].ofs == 0) && + (xref->table[i].gen == 0) && (xref->table[i].obj == nil)) { fz_warn("object (%d %d R) has invalid offset, assumed missing", i, xref->table[i].gen); xref->table[i].type = 'f'; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_font.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_font.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_font.c (working copy) @@ -138,7 +138,7 @@ { int i; for (i = 0; i < 256; i++) - if (pdf_macroman[i] && !strcmp(name, pdf_macroman[i])) + if ((pdf_macroman[i]) && (!strcmp(name, pdf_macroman[i]))) return i; return -1; } @@ -157,7 +157,7 @@ void pdf_dropfont(pdf_fontdesc *fontdesc) { - if (fontdesc && --fontdesc->refs == 0) + if ((fontdesc) && (--fontdesc->refs == 0)) { if (fontdesc->font) fz_dropfont(fontdesc->font); @@ -269,7 +269,7 @@ pdf_logfont("basefont1 %s\n", fontname); descriptor = fz_dictgets(dict, "FontDescriptor"); - if (descriptor && basefont == fontname) + if ((descriptor) && (basefont == fontname)) error = pdf_loadfontdescriptor(fontdesc, xref, descriptor, nil); else error = pdf_loadbuiltinfont(fontdesc, fontname); @@ -316,9 +316,9 @@ if (kind == TRUETYPE) { - if (test->platform_id == 1 && test->encoding_id == 0) + if ((test->platform_id == 1) && (test->encoding_id == 0)) cmap = test; - if (test->platform_id == 3 && test->encoding_id == 1) + if ((test->platform_id == 3) && (test->encoding_id == 1)) cmap = test; } } @@ -340,7 +340,7 @@ } encoding = fz_dictgets(dict, "Encoding"); - if (encoding && !(kind == TRUETYPE && symbolic)) + if ((encoding) && (!((kind == TRUETYPE) && (symbolic)))) { if (fz_isname(encoding)) pdf_loadencoding(estrings, fz_toname(encoding)); @@ -402,7 +402,7 @@ if (kind == TRUETYPE) { /* Unicode cmap */ - if (face->charmap && face->charmap->platform_id == 3) + if ((face->charmap) && (face->charmap->platform_id == 3)) { pdf_logfont("encode truetype via unicode\n"); for (i = 0; i < 256; i++) @@ -421,7 +421,7 @@ } /* MacRoman cmap */ - else if (face->charmap && face->charmap->platform_id == 1) + else if ((face->charmap) && (face->charmap->platform_id == 1)) { pdf_logfont("encode truetype via macroman\n"); for (i = 0; i < 256; i++) @@ -504,7 +504,7 @@ first = fz_toint(fz_dictgets(dict, "FirstChar")); last = fz_toint(fz_dictgets(dict, "LastChar")); - if (first < 0 || last > 255 || first > last) + if ((first < 0) || (last > 255) || (first > last)) first = last = 0; for (i = 0; i < last - first + 1; i++) @@ -838,9 +838,9 @@ encoding = fz_dictgets(dict, "Encoding"); tounicode = fz_dictgets(dict, "ToUnicode"); - if (fz_isname(subtype) && !strcmp(fz_toname(subtype), "CIDFontType0")) + if ((fz_isname(subtype)) && (!strcmp(fz_toname(subtype), "CIDFontType0"))) error = loadcidfont(fontdescp, xref, dfont, encoding, tounicode); - else if (fz_isname(subtype) && !strcmp(fz_toname(subtype), "CIDFontType2")) + else if ((fz_isname(subtype)) && (!strcmp(fz_toname(subtype), "CIDFontType2"))) error = loadcidfont(fontdescp, xref, dfont, encoding, tounicode); else error = fz_throw("syntaxerror: unknown cid font type"); @@ -933,15 +933,15 @@ dfonts = fz_dictgets(dict, "DescendantFonts"); charprocs = fz_dictgets(dict, "CharProcs"); - if (subtype && !strcmp(subtype, "Type0")) + if ((subtype) && (!strcmp(subtype, "Type0"))) error = loadtype0(fontdescp, xref, dict); - else if (subtype && !strcmp(subtype, "Type1")) + else if ((subtype) && (!strcmp(subtype, "Type1"))) error = loadsimplefont(fontdescp, xref, dict); - else if (subtype && !strcmp(subtype, "MMType1")) + else if ((subtype) && (!strcmp(subtype, "MMType1"))) error = loadsimplefont(fontdescp, xref, dict); - else if (subtype && !strcmp(subtype, "TrueType")) + else if ((subtype) && (!strcmp(subtype, "TrueType"))) error = loadsimplefont(fontdescp, xref, dict); - else if (subtype && !strcmp(subtype, "Type3")) + else if ((subtype) && (!strcmp(subtype, "Type3"))) error = pdf_loadtype3font(fontdescp, xref, rdb, dict); else if (charprocs) { Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_parse.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_parse.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_parse.c (working copy) @@ -37,7 +37,7 @@ int ucs; int i; - if (srclen > 2 && srcptr[0] == 254 && srcptr[1] == 255) + if ((srclen > 2) && (srcptr[0] == 254) && (srcptr[1] == 255)) { for (i = 2; i < srclen; i += 2) { @@ -80,7 +80,7 @@ int srclen = fz_tostrlen(src); int i; - if (srclen > 2 && srcptr[0] == 254 && srcptr[1] == 255) + if ((srclen > 2) && (srcptr[0] == 254) && (srcptr[1] == 255)) { dstptr = dst = fz_malloc(((srclen - 2) / 2 + 1) * sizeof(short)); for (i = 2; i < srclen; i += 2) @@ -119,7 +119,7 @@ return fz_rethrow(error, "cannot parse array"); } - if (tok != PDF_TINT && tok != PDF_TR) + if ((tok != PDF_TINT) && (tok != PDF_TR)) { if (n > 0) { @@ -136,7 +136,7 @@ n = 0; } - if (tok == PDF_TINT && n == 2) + if ((tok == PDF_TINT) && (n == 2)) { obj = fz_newint(a); fz_arraypush(ary, obj); @@ -261,7 +261,7 @@ } /* for BI .. ID .. EI in content streams */ - if (tok == PDF_TKEYWORD && !strcmp(buf, "ID")) + if ((tok == PDF_TKEYWORD) && (!strcmp(buf, "ID"))) { *op = dict; return fz_okay; @@ -320,8 +320,8 @@ fz_dropobj(dict); return fz_rethrow(error, "cannot parse dict"); } - if (tok == PDF_TCDICT || tok == PDF_TNAME || - (tok == PDF_TKEYWORD && !strcmp(buf, "ID"))) + if ((tok == PDF_TCDICT) || (tok == PDF_TNAME) || + ((tok == PDF_TKEYWORD) && (!strcmp(buf, "ID")))) { val = fz_newint(a); fz_dictput(dict, key, val); @@ -457,7 +457,7 @@ error = pdf_lex(&tok, file, buf, cap, &len); if (error) return fz_rethrow(error, "cannot parse indirect object (%d %d R)", num, gen); - if (tok == PDF_TSTREAM || tok == PDF_TENDOBJ) + if ((tok == PDF_TSTREAM) || (tok == PDF_TENDOBJ)) { obj = fz_newint(a); goto skip; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_interpret.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_interpret.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_interpret.c (working copy) @@ -196,11 +196,11 @@ return fz_rethrow(error, "cannot add transform node"); } - if (xobj->isolated || xobj->knockout) + if ((xobj->isolated) || (xobj->knockout)) { if (gstate->blendmode != FZ_BNORMAL) fz_warn("ignoring non-normal blendmode (%d)", gstate->blendmode); - if (xobj->isolated && xobj->knockout) + if ((xobj->isolated) && (xobj->knockout)) fz_warn("ignoring that the group is isolated and knockout"); else if (xobj->isolated) fz_warn("ignoring that the group is isolated"); @@ -272,7 +272,7 @@ return fz_rethrow(error, "syntax error after inline image"); } - if (tok != PDF_TKEYWORD || strcmp("EI", buf)) + if ((tok != PDF_TKEYWORD) || (strcmp("EI", buf))) { fz_dropimage((fz_image*)img); return fz_throw("syntax error after inline image"); @@ -308,7 +308,7 @@ if (!strcmp(s, "Font")) { - if (fz_isarray(val) && fz_arraylen(val) == 2) + if ((fz_isarray(val)) && (fz_arraylen(val) == 2)) { fz_error error; @@ -340,7 +340,7 @@ else if (!strcmp(s, "D")) { - if (fz_isarray(val) && fz_arraylen(val) == 2) + if ((fz_isarray(val)) && (fz_arraylen(val) == 2)) { fz_obj *dashes = fz_arrayget(val, 0); gstate->dashlen = MAX(fz_arraylen(dashes), 32); @@ -437,7 +437,7 @@ else if (!strcmp(s, "TR")) { - if (fz_isname(val) && strcmp(fz_toname(val), "Identity")) + if ((fz_isname(val)) && (strcmp(fz_toname(val), "Identity"))) fz_warn("ignoring transfer function"); } } @@ -669,13 +669,13 @@ } } - else if (!strcmp(buf, "sc") || !strcmp(buf, "scn")) + else if ((!strcmp(buf, "sc")) || (!strcmp(buf, "scn"))) { what = PDF_MFILL; goto Lsetcolor; } - else if (!strcmp(buf, "SC") || !strcmp(buf, "SCN")) + else if ((!strcmp(buf, "SC")) || (!strcmp(buf, "SCN"))) { pdf_material *mat; fz_obj *patterntype; @@ -1370,7 +1370,7 @@ csi->array = nil; csi->top ++; } - else if (tok == PDF_TINT || tok == PDF_TREAL) + else if ((tok == PDF_TINT) || (tok == PDF_TREAL)) { obj = fz_newreal(atof(buf)); fz_arraypush(csi->array, obj); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_page.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_page.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_page.c (working copy) @@ -106,7 +106,7 @@ else fz_warn("page contents missing, leaving page blank"); - if (obj && error) + if ((obj) && (error)) { pdf_dropcsi(csi); return fz_rethrow(error, "cannot interpret page contents (%d %d R)", fz_tonum(obj), fz_togen(obj)); @@ -149,7 +149,7 @@ pdf_logpage("bbox [%g %g %g %g]\n", bbox.x0, bbox.y0, bbox.x1, bbox.y1); - if (bbox.x1 - bbox.x0 < 1 || bbox.y1 - bbox.y0 < 1) + if ((bbox.x1 - bbox.x0 < 1) || (bbox.y1 - bbox.y0 < 1)) return fz_throw("invalid page size"); obj = fz_dictgets(dict, "Rotate"); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_pattern.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_pattern.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_pattern.c (working copy) @@ -11,7 +11,7 @@ void pdf_droppattern(pdf_pattern *pat) { - if (pat && --pat->refs == 0) + if ((pat) && (--pat->refs == 0)) { if (pat->tree) fz_droptree(pat->tree); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_cmap_load.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_cmap_load.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_cmap_load.c (working copy) @@ -122,7 +122,7 @@ if (!strcmp(cmapname, pdf_cmaptable[i]->cmapname)) { cmap = pdf_cmaptable[i]; - if (cmap->usecmapname[0] && !cmap->usecmap) + if ((cmap->usecmapname[0]) && (!cmap->usecmap)) { error = pdf_loadsystemcmap(&usecmap, cmap->usecmapname); if (error) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_outline.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_outline.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_outline.c (working copy) @@ -29,7 +29,7 @@ node->count = fz_toint(obj); } - if (fz_dictgets(dict, "Dest") || fz_dictgets(dict, "A")) + if ((fz_dictgets(dict, "Dest")) || (fz_dictgets(dict, "A"))) { node->link = pdf_loadlink(xref, dict); } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_function.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_function.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_function.c (working copy) @@ -200,7 +200,7 @@ { if (!pscheckunderflow(st)) return fz_stackunderflow; - if (!pschecktype(st, PSINT) && !pschecktype(st, PSREAL)) + if ((!pschecktype(st, PSINT)) && (!pschecktype(st, PSREAL))) return fz_stacktypemismatch; *real = (st->stack[st->sp].type == PSINT) ? st->stack[st->sp].u.i : st->stack[st->sp].u.f; @@ -211,29 +211,29 @@ static int pstopisint(psstack *st) { - return st->sp < PSSTACKSIZE && st->stack[st->sp].type == PSINT; + return (st->sp < PSSTACKSIZE) && (st->stack[st->sp].type == PSINT); } static int pstoptwoareints(psstack *st) { - return st->sp < PSSTACKSIZE - 1 && - st->stack[st->sp].type == PSINT && - st->stack[st->sp + 1].type == PSINT; + return (st->sp < PSSTACKSIZE - 1) && + (st->stack[st->sp].type == PSINT) && + (st->stack[st->sp + 1].type == PSINT); } static int pstopisreal(psstack *st) { - return st->sp < PSSTACKSIZE && st->stack[st->sp].type == PSREAL; + return (st->sp < PSSTACKSIZE) && (st->stack[st->sp].type == PSREAL); } static int pstoptwoarenums(psstack *st) { - return st->sp < PSSTACKSIZE - 1 && - (st->stack[st->sp].type == PSINT || st->stack[st->sp].type == PSREAL) && - (st->stack[st->sp + 1].type == PSINT || st->stack[st->sp + 1].type == PSREAL); + return (st->sp < PSSTACKSIZE - 1) && + ((st->stack[st->sp].type == PSINT) || (st->stack[st->sp].type == PSREAL)) && + ((st->stack[st->sp + 1].type == PSINT) || (st->stack[st->sp + 1].type == PSREAL)); } static fz_error @@ -271,7 +271,7 @@ j = n - j; } } - if (n <= 0 || j == 0) + if ((n <= 0) || (j == 0)) { return; } @@ -554,7 +554,7 @@ else { SAFE_POPBOOL(st, &b2); SAFE_POPBOOL(st, &b1); - SAFE_PUSHBOOL(st, b1 && b2); + SAFE_PUSHBOOL(st, (b1) && (b2)); } break; @@ -800,7 +800,7 @@ else { SAFE_POPBOOL(st, &b2); SAFE_POPBOOL(st, &b1); - SAFE_PUSHBOOL(st, b1 || b2); + SAFE_PUSHBOOL(st, (b1) || (b2)); } break; @@ -928,7 +928,7 @@ func->u.sa.samples = nil; obj = fz_dictgets(dict, "Size"); - if (!fz_isarray(obj) || fz_arraylen(obj) != func->m) + if ((!fz_isarray(obj)) || (fz_arraylen(obj) != func->m)) return fz_throw("malformed /Size"); for (i = 0; i < func->m; ++i) func->u.sa.size[i] = fz_toint(fz_arrayget(obj, i)); @@ -1006,7 +1006,7 @@ for (i = 0; i < samplecount; ++i) { - if (fz_peekbyte(stream) == EOF && bits == 0) + if ((fz_peekbyte(stream) == EOF) && (bits == 0)) { error = fz_readerror(stream); fz_dropstream(stream); @@ -1133,7 +1133,7 @@ return fz_throw("/Domain must be one dimension (%d)", func->m); obj = fz_dictgets(dict, "N"); - if (!fz_isint(obj) && !fz_isreal(obj)) + if ((!fz_isint(obj)) && (!fz_isreal(obj))) return fz_throw("malformed /N"); func->u.e.n = fz_toreal(obj); pdf_logrsrc("n %g\n", func->u.e.n); @@ -1185,9 +1185,9 @@ x = CLAMP(x, func->domain[0][0], func->domain[0][1]); /* constraint */ - if (func->u.e.n != (int)func->u.e.n && x < 0) + if ((func->u.e.n != (int)func->u.e.n) && (x < 0)) return fz_throw("constraint error"); - if (func->u.e.n < 0 && x == 0) + if ((func->u.e.n < 0) && (x == 0)) return fz_throw("constraint error"); tmp = pow(x, func->u.e.n); @@ -1243,7 +1243,7 @@ error = pdf_loadfunction(&func->u.st.funcs[i], xref, sub); if (error) return fz_rethrow(error, "cannot load sub function %d", i); - if (funcs[i]->m != 1 || funcs[i]->n != funcs[0]->n) + if ((funcs[i]->m != 1) || (funcs[i]->n != funcs[0]->n)) return fz_rethrow(error, "sub function %d /Domain or /Range mismatch", i); } @@ -1257,21 +1257,21 @@ if (!fz_isarray(obj)) return fz_throw("stitching function has no bounds"); { - if (!fz_isarray(obj) || fz_arraylen(obj) != k - 1) + if ((!fz_isarray(obj)) || (fz_arraylen(obj) != k - 1)) return fz_throw("malformed /Bounds (not array or wrong length)"); for (i = 0; i < k-1; ++i) { num = fz_arrayget(obj, i); - if (!fz_isint(num) && !fz_isreal(num)) + if ((!fz_isint(num)) && (!fz_isreal(num))) return fz_throw("malformed /Bounds (item not number)"); func->u.st.bounds[i] = fz_toreal(num); - if (i && func->u.st.bounds[i-1] > func->u.st.bounds[i]) + if ((i) && (func->u.st.bounds[i-1] > func->u.st.bounds[i])) return fz_throw("malformed /Bounds (item not monotonic)"); } - if (k != 1 && (func->domain[0][0] > func->u.st.bounds[0] || - func->domain[0][1] < func->u.st.bounds[k-2])) + if ((k != 1) && ((func->domain[0][0] > func->u.st.bounds[0]) || + (func->domain[0][1] < func->u.st.bounds[k-2]))) fz_warn("malformed shading function bounds (domain mismatch), proceeding anyway."); } @@ -1279,7 +1279,7 @@ if (!fz_isarray(obj)) return fz_throw("stitching function is missing encoding"); { - if (!fz_isarray(obj) || fz_arraylen(obj) != k * 2) + if ((!fz_isarray(obj)) || (fz_arraylen(obj) != k * 2)) return fz_throw("malformed /Encode"); for (i = 0; i < k; ++i) { @@ -1310,7 +1310,7 @@ break; } - if (i == 0 && k == 1) + if ((i == 0) && (k == 1)) { low = func->domain[0][0]; high = func->domain[0][1]; @@ -1436,7 +1436,7 @@ func->n = 0; } - if (func->m >= MAXM || func->n >= MAXN) + if ((func->m >= MAXM) || (func->n >= MAXN)) { fz_free(func); return fz_throw("assert: /Domain or /Range too big"); @@ -1500,7 +1500,7 @@ float r; int i; - if (func->m != inlen || func->n != outlen) + if ((func->m != inlen) || (func->n != outlen)) return fz_throw("function argument count mismatch"); switch(func->type) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_lex.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_lex.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_lex.c (working copy) @@ -9,50 +9,50 @@ static inline int iswhite(int ch) { return - ch == '\000' || - ch == '\011' || - ch == '\012' || - ch == '\014' || - ch == '\015' || - ch == '\040'; + (ch == '\000') || + (ch == '\011') || + (ch == '\012') || + (ch == '\014') || + (ch == '\015') || + (ch == '\040'); } static inline int isdelim(int ch) { return - ch == '(' || ch == ')' || - ch == '<' || ch == '>' || - ch == '[' || ch == ']' || - ch == '{' || ch == '}' || - ch == '/' || - ch == '%'; + (ch == '(') || (ch == ')') || + (ch == '<') || (ch == '>') || + (ch == '[') || (ch == ']') || + (ch == '{') || (ch == '}') || + (ch == '/') || + (ch == '%'); } static inline int isregular(int ch) { - return !isdelim(ch) && !iswhite(ch) && ch != EOF; + return (!isdelim(ch)) && (!iswhite(ch)) && (ch != EOF); } static inline int isnumber(int ch) { - return ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9'); + return (ch == '+') || (ch == '-') || (ch == '.') || ((ch >= '0') && (ch <= '9')); } static inline int ishex(int ch) { return - (ch >= '0' && ch <= '9') || - (ch >= 'A' && ch <= 'F') || - (ch >= 'a' && ch <= 'f'); + ((ch >= '0') && (ch <= '9')) || + ((ch >= 'A') && (ch <= 'F')) || + ((ch >= 'a') && (ch <= 'f')); } static inline int fromhex(int ch) { - if (ch >= '0' && ch <= '9') + if ((ch >= '0') && (ch <= '9')) return ch - '0'; - else if (ch >= 'A' && ch <= 'F') + else if ((ch >= 'A') && (ch <= 'F')) return ch - 'A' + 0xA; - else if (ch >= 'a' && ch <= 'f') + else if ((ch >= 'a') && (ch <= 'f')) return ch - 'a' + 0xA; return 0; } @@ -113,7 +113,7 @@ while (*p) { - if (p[0] == '#' && p[1] != 0 && p[2] != 0) + if ((p[0] == '#') && (p[1] != 0) && (p[2] != 0)) { *q++ = fromhex(p[1]) * 16 + fromhex(p[2]); p += 3; @@ -160,16 +160,16 @@ else if (c == ')') *s++ = ')'; else if (c == '\\') *s++ = '\\'; - else if (c >= '0' && c <= '9') + else if ((c >= '0') && (c <= '9')) { oct = c - '0'; c = fz_peekbyte(f); - if (c >= '0' && c <= '9') + if ((c >= '0') && (c <= '9')) { fz_readbyte(f); oct = oct * 8 + (c - '0'); c = fz_peekbyte(f); - if (c >= '0' && c <= '9') + if ((c >= '0') && (c <= '9')) { fz_readbyte(f); oct = oct * 8 + (c - '0'); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_fontagl.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_fontagl.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_fontagl.c (working copy) @@ -5094,7 +5094,7 @@ return strtol(buf + 3, nil, 16); else if (strstr(buf, "u") == buf) return strtol(buf + 1, nil, 16); - else if (strstr(buf, "a") == buf && strlen(buf) >= 3) + else if ((strstr(buf, "a") == buf) && (strlen(buf) >= 3)) return strtol(buf + 1, nil, 10); return 0; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_stream.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_stream.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_stream.c (working copy) @@ -9,7 +9,7 @@ { fz_error error; - if (num < 0 || num >= xref->len) + if ((num < 0) || (num >= xref->len)) return 0; error = pdf_cacheobject(xref, num, gen); @@ -66,22 +66,22 @@ s = fz_toname(f); - if (!strcmp(s, "ASCIIHexDecode") || !strcmp(s, "AHx")) + if ((!strcmp(s, "ASCIIHexDecode")) || (!strcmp(s, "AHx"))) return fz_newahxd(p); - else if (!strcmp(s, "ASCII85Decode") || !strcmp(s, "A85")) + else if ((!strcmp(s, "ASCII85Decode")) || (!strcmp(s, "A85"))) return fz_newa85d(p); - else if (!strcmp(s, "CCITTFaxDecode") || !strcmp(s, "CCF")) + else if ((!strcmp(s, "CCITTFaxDecode")) || (!strcmp(s, "CCF"))) return fz_newfaxd(p); - else if (!strcmp(s, "DCTDecode") || !strcmp(s, "DCT")) + else if ((!strcmp(s, "DCTDecode")) || (!strcmp(s, "DCT"))) return fz_newdctd(p); - else if (!strcmp(s, "RunLengthDecode") || !strcmp(s, "RL")) + else if ((!strcmp(s, "RunLengthDecode")) || (!strcmp(s, "RL"))) return fz_newrld(p); - else if (!strcmp(s, "FlateDecode") || !strcmp(s, "Fl")) + else if ((!strcmp(s, "FlateDecode")) || (!strcmp(s, "Fl"))) { fz_obj *obj = fz_dictgets(p, "Predictor"); if (obj) @@ -96,7 +96,7 @@ return fz_newflated(p); } - else if (!strcmp(s, "LZWDecode") || !strcmp(s, "LZW")) + else if ((!strcmp(s, "LZWDecode")) || (!strcmp(s, "LZW"))) { fz_obj *obj = fz_dictgets(p, "Predictor"); if (obj) @@ -157,7 +157,7 @@ } name = fz_dictgets(p, "Name"); - if (fz_isname(name) && strcmp(fz_toname(name), "Identity") != 0) + if ((fz_isname(name)) && (strcmp(fz_toname(name), "Identity") != 0)) { fz_obj *obj = fz_dictget(xref->crypt->cf, name); if (fz_isdict(obj)) @@ -234,7 +234,7 @@ base = fz_newnullfilter(len); - if (xref->crypt && !hascrypt) + if ((xref->crypt) && (!hascrypt)) { fz_filter *crypt; fz_filter *pipe; @@ -318,7 +318,7 @@ fz_error error; fz_filter *filter; - if (num < 0 || num >= xref->len) + if ((num < 0) || (num >= xref->len)) return fz_throw("object id out of range (%d %d R)", num, gen); x = xref->table + num; @@ -355,7 +355,7 @@ fz_error error; fz_filter *filter; - if (num < 0 || num >= xref->len) + if ((num < 0) || (num >= xref->len)) return fz_throw("object id out of range (%d %d R)", num, gen); x = xref->table + num; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_pagetree.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_pagetree.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_pagetree.c (working copy) @@ -157,25 +157,25 @@ { pdf_logpage("page %d (%d %d R)\n", *pagesp, fz_tonum(node), fz_togen(node)); - if (inherit.resources && !fz_dictgets(node, "Resources")) + if ((inherit.resources) && (!fz_dictgets(node, "Resources"))) { pdf_logpage("inherited resources\n"); fz_dictputs(node, "Resources", inherit.resources); } - if (inherit.mediabox && !fz_dictgets(node, "MediaBox")) + if ((inherit.mediabox) && (!fz_dictgets(node, "MediaBox"))) { pdf_logpage("inherit mediabox\n"); fz_dictputs(node, "MediaBox", inherit.mediabox); } - if (inherit.cropbox && !fz_dictgets(node, "CropBox")) + if ((inherit.cropbox) && (!fz_dictgets(node, "CropBox"))) { pdf_logpage("inherit cropbox\n"); fz_dictputs(node, "CropBox", inherit.cropbox); } - if (inherit.rotate && !fz_dictgets(node, "Rotate")) + if ((inherit.rotate) && (!fz_dictgets(node, "Rotate"))) { pdf_logpage("inherit rotate\n"); fz_dictputs(node, "Rotate", inherit.rotate); @@ -210,7 +210,7 @@ pdf_logpage("subtree (%d %d R) {\n", fz_tonum(node), fz_togen(node)); - for (i = 0; !(*pagep) && i < fz_arraylen(kids); i++) + for (i = 0; (!(*pagep)) && (i < fz_arraylen(kids)); i++) { fz_obj *obj = fz_arrayget(kids, i); @@ -310,7 +310,7 @@ pdf_logpage("subtree (%d %d R) {\n", fz_tonum(node), fz_togen(node)); - for (i = 0; !(*foundp) && i < fz_arraylen(kids); i++) + for (i = 0; (!(*foundp)) && (i < fz_arraylen(kids)); i++) { fz_obj *obj = fz_arrayget(kids, i); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_store.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_store.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_store.c (working copy) @@ -161,7 +161,7 @@ { key = fz_hashgetkey(store->hash, i); item = fz_hashfind(store->hash, key); - if (item && item->age > itemmaxage(item->kind)) + if ((item) && (item->age > itemmaxage(item->kind))) { fz_hashremove(store->hash, key); evictitem(item); @@ -263,7 +263,7 @@ else { for (item = store->root; item; item = item->next) - if (item->kind == kind && !fz_objcmp(item->key, key)) + if ((item->kind == kind) && (!fz_objcmp(item->key, key))) { item->age = 0; return item->val; @@ -305,7 +305,7 @@ prev = nil; for (item = store->root; item; item = item->next) { - if (item->kind == kind && !fz_objcmp(item->key, key)) + if ((item->kind == kind) && (!fz_objcmp(item->key, key))) { if (!prev) store->root = item->next; @@ -335,7 +335,7 @@ { key = fz_hashgetkey(store->hash, i); item = fz_hashgetval(store->hash, i); - if (key && item) + if ((key) && (item)) { printf("store[%d] (%d %d R) = %p\n", i, key->oid, key->gen, item->val); } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_xobject.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_xobject.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_xobject.c (working copy) @@ -56,7 +56,7 @@ form->knockout = fz_tobool(fz_dictgets(attrs, "K")); obj = fz_dictgets(attrs, "S"); - if (fz_isname(obj) && !strcmp(fz_toname(obj), "Transparency")) + if ((fz_isname(obj)) && (!strcmp(fz_toname(obj), "Transparency"))) form->transparency = 1; } @@ -98,7 +98,7 @@ void pdf_dropxobject(pdf_xobject *xobj) { - if (xobj && --xobj->refs == 0) + if ((xobj) && (--xobj->refs == 0)) { if (xobj->resources) fz_dropobj(xobj->resources); if (xobj->contents) fz_dropbuffer(xobj->contents); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_build.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_build.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_build.c (working copy) @@ -618,7 +618,7 @@ if (error) return fz_rethrow(error, "cannot create image node"); - if (img->super.n == 0 && img->super.a == 1) + if ((img->super.n == 0) && (img->super.a == 1)) { error = pdf_addfillshape(csi->gstate + csi->gtop, color); if (error) @@ -689,7 +689,7 @@ return fz_rethrow(error, "cannot copy path node for clip mask"); } - if (dofill && dostroke) + if ((dofill) && (dostroke)) { fpath = csi->path; error = fz_clonepathnode(&spath, fpath); @@ -888,13 +888,13 @@ trm = fz_concat(tsm, csi->tm); /* flush buffered text if face or matrix or rendermode has changed */ - if (!csi->text || - (fontdesc->font) != csi->text->font || - fabs(trm.a - csi->text->trm.a) > FLT_EPSILON || - fabs(trm.b - csi->text->trm.b) > FLT_EPSILON || - fabs(trm.c - csi->text->trm.c) > FLT_EPSILON || - fabs(trm.d - csi->text->trm.d) > FLT_EPSILON || - gstate->render != csi->textmode) + if ((!csi->text) || + ((fontdesc->font) != csi->text->font) || + (fabs(trm.a - csi->text->trm.a) > FLT_EPSILON) || + (fabs(trm.b - csi->text->trm.b) > FLT_EPSILON) || + (fabs(trm.c - csi->text->trm.c) > FLT_EPSILON) || + (fabs(trm.d - csi->text->trm.d) > FLT_EPSILON) || + (gstate->render != csi->textmode)) { error = pdf_flushtext(csi); if (error) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_nametree.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_nametree.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_nametree.c (working copy) @@ -73,7 +73,7 @@ } /* PDF 1.2 has destinations in a name tree */ - if (names && !dest) + if ((names) && (!dest)) { fz_obj *desttree = fz_dictgets(names, "Dests"); if (desttree) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_crypt.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_crypt.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_crypt.c (working copy) @@ -37,14 +37,14 @@ obj = fz_dictgets(dict, "V"); if (fz_isint(obj)) crypt->v = fz_toint(obj); - if (crypt->v != 1 && crypt->v != 2 && crypt->v != 4) + if ((crypt->v != 1) && (crypt->v != 2) && (crypt->v != 4)) { pdf_freecrypt(crypt); return fz_throw("unknown encryption version"); } crypt->length = 40; - if (crypt->v == 2 || crypt->v == 4) + if ((crypt->v == 2) || (crypt->v == 4)) { obj = fz_dictgets(dict, "Length"); if (fz_isint(obj)) @@ -66,7 +66,7 @@ } } - if (crypt->v == 1 || crypt->v == 2) + if ((crypt->v == 1) || (crypt->v == 2)) { crypt->stmf.method = PDF_CRYPT_RC4; crypt->stmf.length = crypt->length; @@ -136,7 +136,7 @@ } obj = fz_dictgets(dict, "O"); - if (fz_isstring(obj) && fz_tostrlen(obj) == 32) + if ((fz_isstring(obj)) && (fz_tostrlen(obj) == 32)) memcpy(crypt->o, fz_tostrbuf(obj), 32); else { @@ -145,7 +145,7 @@ } obj = fz_dictgets(dict, "U"); - if (fz_isstring(obj) && fz_tostrlen(obj) == 32) + if ((fz_isstring(obj)) && (fz_tostrlen(obj) == 32)) memcpy(crypt->u, fz_tostrbuf(obj), 32); else { @@ -173,7 +173,7 @@ crypt->idlength = 0; - if (fz_isarray(id) && fz_arraylen(id) == 2) + if ((fz_isarray(id)) && (fz_arraylen(id) == 2)) { obj = fz_arrayget(id, 0); if (fz_isstring(obj)) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_type3.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_type3.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_type3.c (working copy) @@ -170,9 +170,9 @@ resources = fz_dictgets(dict, "Resources"); /* Inherit page's resource dict if type3 font does not have one */ - if (!resources && rdb) + if ((!resources) && (rdb)) resources = rdb; - else if (!resources && !rdb) + else if ((!resources) && (!rdb)) fz_warn("no resource dictionary for type 3 font!"); /* Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_xref.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_xref.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/mupdf/pdf_xref.c (working copy) @@ -103,7 +103,7 @@ } else { - if (xref->table[i].obj && xref->table[i].obj->refs == 1) + if ((xref->table[i].obj) && (xref->table[i].obj->refs == 1)) { fz_dropobj(xref->table[i].obj); xref->table[i].obj = nil; @@ -164,7 +164,7 @@ pdf_xrefentry *x; int roid, rgen; - if (oid < 0 || oid >= xref->len) + if ((oid < 0) || (oid >= xref->len)) return fz_throw("object out of range (%d %d R); xref size %d", oid, gen, xref->len); x = &xref->table[oid]; @@ -172,7 +172,7 @@ if (x->obj) return fz_okay; - if (x->type == 'f' || x->type == 'd') + if ((x->type == 'f') || (x->type == 'd')) { x->obj = fz_newnull(); return fz_okay; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_read.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_read.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_read.c (working copy) @@ -206,7 +206,7 @@ while (i < n) { - while (buf->rp < buf->wp && i < n) + while ((buf->rp < buf->wp) && (i < n)) mem[i++] = *buf->rp++; if (buf->rp == buf->wp) @@ -247,7 +247,7 @@ if (buf->rp == buf->wp) { - if (!buf->eof && !stm->error) + if ((!buf->eof) && (!stm->error)) { fz_error error = fz_readimp(stm); if (error) @@ -265,7 +265,7 @@ if (buf->rp == buf->wp) { - if (!buf->eof && !stm->error) + if ((!buf->eof) && (!stm->error)) { fz_error error = fz_readimp(stm); if (error) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_basic.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_basic.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_basic.c (working copy) @@ -112,18 +112,18 @@ static inline int ishex(int a) { - return (a >= 'A' && a <= 'F') || - (a >= 'a' && a <= 'f') || - (a >= '0' && a <= '9'); + return ((a >= 'A') && (a <= 'F')) || + ((a >= 'a') && (a <= 'f')) || + ((a >= '0') && (a <= '9')); } static inline int fromhex(int a) { - if (a >= 'A' && a <= 'F') + if ((a >= 'A') && (a <= 'F')) return a - 'A' + 0xA; - if (a >= 'a' && a <= 'f') + if ((a >= 'a') && (a <= 'f')) return a - 'a' + 0xA; - if (a >= '0' && a <= '9') + if ((a >= '0') && (a <= '9')) return a - '0'; return 0; } @@ -236,7 +236,7 @@ c = *in->rp++; - if (c >= '!' && c <= 'u') { + if ((c >= '!') && (c <= 'u')) { if (f->count == 4) { if (out->wp + 4 > out->ep) { in->rp --; @@ -259,7 +259,7 @@ } } - else if (c == 'z' && f->count == 0) { + else if ((c == 'z') && (f->count == 0)) { if (out->wp + 4 > out->ep) { in->rp --; return fz_ioneedout; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_string.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_string.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_string.c (working copy) @@ -17,7 +17,7 @@ register int n = siz; /* Copy as many bytes as will fit */ - if (n != 0 && --n != 0) { + if ((n != 0) && (--n != 0)) { do { if ((*d++ = *s++) == 0) break; @@ -43,7 +43,7 @@ int dlen; /* Find the end of dst and adjust bytes left but don't go past end */ - while (*d != '\0' && n-- != 0) + while ((*d != '\0') && (n-- != 0)) d++; dlen = d - dst; n = siz - dlen; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_colorspace.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_colorspace.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_colorspace.c (working copy) @@ -25,9 +25,9 @@ void fz_dropcolorspace(fz_colorspace *cs) { - if (cs && cs->refs < 0) + if ((cs) && (cs->refs < 0)) return; - if (cs && --cs->refs == 0) + if ((cs) && (--cs->refs == 0)) { if (cs->freefunc) cs->freefunc(cs); @@ -65,7 +65,7 @@ unsigned char *s = src->samples; unsigned char *d = dst->samples; - assert(src->w == dst->w && src->h == dst->h); + assert((src->w == dst->w) && (src->h == dst->h)); assert(src->n == srcs->n + 1); assert(dst->n == dsts->n + 1); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_predict.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_predict.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_predict.c (working copy) @@ -37,10 +37,10 @@ if (obj) p->predictor = fz_toint(obj); - if (p->predictor != 1 && p->predictor != 2 && - p->predictor != 10 && p->predictor != 11 && - p->predictor != 12 && p->predictor != 13 && - p->predictor != 14 && p->predictor != 15) + if ((p->predictor != 1) && (p->predictor != 2) && + (p->predictor != 10) && (p->predictor != 11) && + (p->predictor != 12) && (p->predictor != 13) && + (p->predictor != 14) && (p->predictor != 15)) { fz_warn("invalid predictor: %d", p->predictor); p->predictor = 1; @@ -114,7 +114,7 @@ int pa = (ac < 0 ? -ac : ac); int pb = (bc < 0 ? -bc : bc); int pc = (abcc < 0 ? -abcc : abcc); - return pa <= pb && pa <= pc ? a : pb <= pc ? b : c; + return (pa <= pb) && (pa <= pc) ? a : pb <= pc ? b : c; } static inline void Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_array.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_array.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_array.c (working copy) @@ -59,7 +59,7 @@ if (!fz_isarray(obj)) return nil; - if (i < 0 || i >= obj->u.a.len) + if ((i < 0) || (i >= obj->u.a.len)) return nil; return obj->u.a.items[i]; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_flate.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_flate.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_flate.c (working copy) @@ -79,7 +79,7 @@ z_streamp zp = &((fz_flate*)f)->z; int err; - if (in->rp == in->wp && !in->eof) + if ((in->rp == in->wp) && (!in->eof)) return fz_ioneedin; if (out->wp == out->ep) return fz_ioneedout; @@ -93,19 +93,19 @@ err = inflate(zp, Z_NO_FLUSH); /* Make sure we call it with Z_FINISH at the end of input */ - if (err == Z_OK && in->eof && zp->avail_in == 0 && zp->avail_out > 0) + if ((err == Z_OK) && (in->eof) && (zp->avail_in == 0) && (zp->avail_out > 0)) err = inflate(zp, Z_FINISH); in->rp = in->wp - zp->avail_in; out->wp = out->ep - zp->avail_out; - if (err == Z_STREAM_END || err == Z_BUF_ERROR) + if ((err == Z_STREAM_END) || (err == Z_BUF_ERROR)) { return fz_iodone; } else if (err == Z_OK) { - if (in->rp == in->wp && !in->eof) + if ((in->rp == in->wp) && (!in->eof)) return fz_ioneedin; if (out->wp == out->ep) return fz_ioneedout; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_hash.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_hash.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_hash.c (working copy) @@ -202,9 +202,9 @@ while (ents[look].val) { code = hash(ents[look].key, table->keylen) % size; - if ((code <= hole && hole < look) || - (look < code && code <= hole) || - (hole < look && look < code)) + if (((code <= hole) && (hole < look)) || + ((look < code) && (code <= hole)) || + ((hole < look) && (look < code))) { ents[hole] = ents[look]; ents[look].val = nil; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_dict.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_dict.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_dict.c (working copy) @@ -7,7 +7,7 @@ { const fz_keyval *a = ap; const fz_keyval *b = bp; - if (fz_isname(a->k) && fz_isname(b->k)) + if ((fz_isname(a->k)) && (fz_isname(b->k))) return strcmp(fz_toname(a->k), fz_toname(b->k)); return -1; } @@ -76,7 +76,7 @@ if (!fz_isdict(obj)) return nil; - if (i < 0 || i >= obj->u.d.len) + if ((i < 0) || (i >= obj->u.d.len)) return nil; return obj->u.d.items[i].k; @@ -90,7 +90,7 @@ if (!fz_isdict(obj)) return nil; - if (i < 0 || i >= obj->u.d.len) + if ((i < 0) || (i >= obj->u.d.len)) return nil; return obj->u.d.items[i].v; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_font.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_font.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_font.c (working copy) @@ -45,7 +45,7 @@ int fterr; int i; - if (font && --font->refs == 0) + if ((font) && (--font->refs == 0)) { if (font->t3procs) { @@ -128,7 +128,7 @@ return fz_throw("cannot init freetype: %s", ft_errorstring(fterr)); FT_Library_Version(fz_ftlib, &maj, &min, &pat); - if (maj == 2 && min == 1 && pat < 7) + if ((maj == 2) && (min == 1) && (pat < 7)) { fterr = FT_Done_FreeType(fz_ftlib); if (fterr) @@ -372,7 +372,7 @@ pixmap = nil; } - if (gid < 0 || gid > 255) + if ((gid < 0) || (gid > 255)) return fz_throw("assert: glyph out of range"); tree = font->t3procs[gid]; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_unicode.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_unicode.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_unicode.c (working copy) @@ -207,7 +207,7 @@ if (c < T3) return 1; if (n > 2) { - if (c < T4 || n > 3) + if ((c < T4) || (n > 3)) return 1; } } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_simple.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_simple.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_simple.c (working copy) @@ -238,7 +238,7 @@ if (fz_isindirect(ref)) { - if (!ref->u.r.obj && ref->u.r.xref) + if ((!ref->u.r.obj) && (ref->u.r.xref)) { error = pdf_loadobject(&ref->u.r.obj, ref->u.r.xref, fz_tonum(ref), fz_togen(ref)); if (error) @@ -261,7 +261,7 @@ if (a == b) return 0; - if (!a || !b) + if ((!a) || (!b)) return 1; if (a->kind != b->kind) Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_pipeline.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_pipeline.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_pipeline.c (working copy) @@ -69,7 +69,7 @@ if (p->buffer->eof) goto tail; - if (p->tailneedsin && p->head->produced) + if ((p->tailneedsin) && (p->head->produced)) goto tail; head: @@ -80,7 +80,7 @@ else if (e == fz_ioneedout) { - if (p->tailneedsin && !p->head->produced) + if ((p->tailneedsin) && (!p->head->produced)) { if (p->buffer->rp > p->buffer->bp) fz_rewindbuffer(p->buffer); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_rect.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_rect.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_rect.c (working copy) @@ -27,14 +27,14 @@ r.y0 = MAX(a.y0, b.y0); r.x1 = MIN(a.x1, b.x1); r.y1 = MIN(a.y1, b.y1); - return (r.x1 < r.x0 || r.y1 < r.y0) ? fz_emptyrect : r; + return ((r.x1 < r.x0) || (r.y1 < r.y0)) ? fz_emptyrect : r; } fz_rect fz_mergerects(fz_rect a, fz_rect b) { fz_rect r; - if (fz_isinfiniterect(a) || fz_isinfiniterect(b)) + if ((fz_isinfiniterect(a)) || (fz_isinfiniterect(b))) return fz_infiniterect; if (fz_isemptyrect(a)) return b; if (fz_isemptyrect(b)) return a; @@ -55,14 +55,14 @@ r.y0 = MAX(a.y0, b.y0); r.x1 = MIN(a.x1, b.x1); r.y1 = MIN(a.y1, b.y1); - return (r.x1 < r.x0 || r.y1 < r.y0) ? empty : r; + return ((r.x1 < r.x0) || (r.y1 < r.y0)) ? empty : r; } fz_irect fz_mergeirects(fz_irect a, fz_irect b) { fz_irect r; - if (fz_isinfiniterect(a) || fz_isinfiniterect(b)) + if ((fz_isinfiniterect(a)) || (fz_isinfiniterect(b))) return infinite; if (fz_isemptyrect(a)) return b; if (fz_isemptyrect(b)) return a; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/crypt_aes.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/crypt_aes.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/crypt_aes.c (working copy) @@ -361,7 +361,7 @@ */ #define ROTL8(x) ( ( x << 8 ) & 0xFFFFFFFF ) | ( x >> 24 ) #define XTIME(x) ( ( x << 1 ) ^ ( ( x & 0x80 ) ? 0x1B : 0x00 ) ) -#define MUL(x,y) ( ( x && y ) ? pow[(log[x]+log[y]) % 255] : 0 ) +#define MUL(x,y) ( ( (x) && (y) ) ? pow[(log[x]+log[y]) % 255] : 0 ) static int aes_init_done = 0; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_aesd.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_aesd.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_aesd.c (working copy) @@ -57,10 +57,10 @@ out->wp += n; /* Remove padding bytes */ - if (in->eof && in->rp == in->wp) + if ((in->eof) && (in->rp == in->wp)) { int pad = out->wp[-1]; - if (pad < 1 || pad > 16) + if ((pad < 1) || (pad > 16)) return fz_throw("aes padding out of range: %d", pad); out->wp -= pad; } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_lzwd.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_lzwd.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_lzwd.c (working copy) @@ -113,7 +113,7 @@ static inline void unstuff(fz_lzwd *lzw, fz_buffer *in) { int i = (32 - lzw->bidx) / 8; - while (i-- && in->rp > in->bp) + while ((i--) && (in->rp > in->bp)) in->rp --; } @@ -212,7 +212,7 @@ { *(--s) = lzw->table[lzw->code].value; lzw->code = lzw->table[lzw->code].prev; - } while (lzw->code >= 0 && s > out->wp); + } while ((lzw->code >= 0) && (s > out->wp)); out->wp += len; } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_matrix.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_matrix.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_matrix.c (working copy) @@ -139,8 +139,8 @@ int fz_isrectilinear(fz_matrix m) { - return (fabs(m.b) < FLT_EPSILON && fabs(m.c) < FLT_EPSILON) || - (fabs(m.a) < FLT_EPSILON && fabs(m.d) < FLT_EPSILON); + return ((fabs(m.b) < FLT_EPSILON) && (fabs(m.c) < FLT_EPSILON)) || + ((fabs(m.a) < FLT_EPSILON) && (fabs(m.d) < FLT_EPSILON)); } float Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/util_getopt.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/util_getopt.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/util_getopt.c (working copy) @@ -62,18 +62,18 @@ char *p; if (!*place) { /* update scanning pointer */ - if (optind >= nargc || *(place = nargv[optind]) != '-') { + if ((optind >= nargc) || (*(place = nargv[optind]) != '-')) { place = EMSG; return(EOF); } - if (place[1] && *++place == '-') { /* found "--" */ + if ((place[1]) && (*++place == '-')) { /* found "--" */ ++optind; place = EMSG; return(EOF); } } /* option letter okay? */ - if ((optopt = (int)*place++) == (int)':' || - !(oli = strchr(ostr, optopt))) { + if (((optopt = (int)*place++) == (int)':') || + (!(oli = strchr(ostr, optopt)))) { /* * if the user didn't specify '-' as an option, * assume it means EOF. Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_faxd.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_faxd.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/filt_faxd.c (working copy) @@ -90,7 +90,7 @@ x = findchanging(line, x, w); - if (x < w && getbit(line, x) != color) + if ((x < w) && (getbit(line, x) != color)) x = findchanging(line, x, w); return x; @@ -317,7 +317,7 @@ { int code, b1, b2; - if (fax->stage == SH1 || fax->stage == SH2) + if ((fax->stage == SH1) || (fax->stage == SH2)) { if (fax->a == -1) fax->a = 0; @@ -491,7 +491,7 @@ eatbits(fax, 1); } } - else if (fax->k > 0 && fax->a == -1) + else if ((fax->k > 0) && (fax->a == -1)) { fax->a = 0; if ((fax->word >> (32 - 1)) == 1) @@ -515,11 +515,11 @@ } /* no eol check after makeup codes nor in the middle of an H code */ - if (fax->stage == SMAKEUP || fax->stage == SH1 || fax->stage == SH2) + if ((fax->stage == SMAKEUP) || (fax->stage == SH1) || (fax->stage == SH2)) goto loop; /* check for eol conditions */ - if (fax->eolc || fax->a >= fax->columns) + if ((fax->eolc) || (fax->a >= fax->columns)) { if (fax->a > 0) goto eol; @@ -555,14 +555,14 @@ fax->a = -1; fax->ridx ++; - if (!fax->endofblock && fax->rows) + if ((!fax->endofblock) && (fax->rows)) { if (fax->ridx >= fax->rows) goto rtc; } /* we have not read dim from eol, make a guess */ - if (fax->k > 0 && !fax->eolc && fax->a == -1) + if ((fax->k > 0) && (!fax->eolc) && (fax->a == -1)) { if (fax->ridx % fax->k == 0) fax->dim = 1; @@ -583,7 +583,7 @@ rtc: i = (32 - fax->bidx) / 8; - while (i-- && in->rp > in->bp) + while ((i--) && (in->rp > in->bp)) in->rp --; return fz_iodone; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_parse.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_parse.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_parse.c (working copy) @@ -8,37 +8,37 @@ static inline int iswhite(int ch) { return - ch == '\000' || - ch == '\011' || - ch == '\012' || - ch == '\014' || - ch == '\015' || - ch == '\040'; + (ch == '\000') || + (ch == '\011') || + (ch == '\012') || + (ch == '\014') || + (ch == '\015') || + (ch == '\040'); } static inline int isdelim(int ch) { return - ch == '(' || ch == ')' || - ch == '<' || ch == '>' || - ch == '[' || ch == ']' || - ch == '{' || ch == '}' || - ch == '/' || - ch == '%'; + (ch == '(') || (ch == ')') || + (ch == '<') || (ch == '>') || + (ch == '[') || (ch == ']') || + (ch == '{') || (ch == '}') || + (ch == '/') || + (ch == '%'); } static inline int isregular(int ch) { - return !isdelim(ch) && !iswhite(ch) && ch != EOF; + return (!isdelim(ch)) && (!iswhite(ch)) && (ch != EOF); } static inline int fromhex(char ch) { - if (ch >= '0' && ch <= '9') + if ((ch >= '0') && (ch <= '9')) return ch - '0'; - else if (ch >= 'A' && ch <= 'F') + else if ((ch >= 'A') && (ch <= 'F')) return ch - 'A' + 0xA; - else if (ch >= 'a' && ch <= 'f') + else if ((ch >= 'a') && (ch <= 'f')) return ch - 'a' + 0xA; return 0; } @@ -54,7 +54,7 @@ static void parsekeyword(char **sp, char *b, char *eb) { char *s = *sp; - while (b < eb && isregular(*s)) + while ((b < eb) && (isregular(*s))) *b++ = *s++; *b++ = 0; *sp = s; @@ -67,7 +67,7 @@ char *p = buf; s ++; /* skip '/' */ - while (p < buf + sizeof buf - 1 && isregular(*s)) + while ((p < buf + sizeof buf - 1) && (isregular(*s))) *p++ = *s++; *p++ = 0; *sp = s; @@ -83,7 +83,7 @@ while (p < buf + sizeof buf - 1) { - if (s[0] == '-' || s[0] == '.' || (s[0] >= '0' && s[0] <= '9')) + if ((s[0] == '-') || (s[0] == '.') || ((s[0] >= '0') && (s[0] <= '9'))) *p++ = *s++; else break; @@ -210,7 +210,7 @@ s ++; /* skip '(' */ - while (*s && p < buf + sizeof buf) + while ((*s) && (p < buf + sizeof buf)) { if (*s == '(') { @@ -225,15 +225,15 @@ else if (*s == '\\') { s ++; - if (*s >= '0' && *s <= '9') + if ((*s >= '0') && (*s <= '9')) { oct = *s - '0'; s ++; - if (*s >= '0' && *s <= '9') + if ((*s >= '0') && (*s <= '9')) { oct = oct * 8 + (*s - '0'); s ++; - if (*s >= '0' && *s <= '9') + if ((*s >= '0') && (*s <= '9')) { oct = oct * 8 + (*s - '0'); s ++; @@ -271,7 +271,7 @@ s ++; /* skip '<' */ - while (*s && p < buf + sizeof buf) + while ((*s) && (p < buf + sizeof buf)) { skipwhite(&s); if (*s == '>') { @@ -310,7 +310,7 @@ skipwhite(&s); - if (v != nil && *s == '%') + if ((v != nil) && (*s == '%')) { s ++; @@ -373,7 +373,7 @@ return fz_rethrow(error, "cannot parse array"); } - else if (*s == '-' || *s == '.' || (*s >= '0' && *s <= '9')) + else if ((*s == '-') || (*s == '.') || ((*s >= '0') && (*s <= '9'))) { *obj = parsenumber(&s); } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/node_toxml.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/node_toxml.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/node_toxml.c (working copy) @@ -120,7 +120,7 @@ for (i = 0; i < node->len; i++) { indent(level + 1); - if (node->els[i].ucs >= 32 && node->els[i].ucs < 128) + if ((node->els[i].ucs >= 32) && (node->els[i].ucs < 128)) printf("\n", node->els[i].ucs, node->els[i].gid, node->els[i].x, node->els[i].y); else Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_filter.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_filter.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_filter.c (working copy) @@ -26,7 +26,7 @@ f->count += out->wp - oldwp; /* iodone or error */ - if (reason != fz_ioneedin && reason != fz_ioneedout) + if ((reason != fz_ioneedin) && (reason != fz_ioneedout)) { if (reason != fz_iodone) reason = fz_rethrow(reason, "cannot process filter"); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_cpudep.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_cpudep.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/base_cpudep.c (working copy) @@ -154,9 +154,9 @@ s = env; while ((s = strstr(s, ext))) { - int atstart = s == env || *(s-1) == ',' || *(s-1) == ' '; + int atstart = (s == env) || (*(s-1) == ',') || (*(s-1) == ' '); s += len; - if (atstart && (*s == ' ' || *s == ',' || *s == '\0')) { + if ((atstart) && ((*s == ' ') || (*s == ',') || (*s == '\0'))) { return 1; } } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_misc.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_misc.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/stm_misc.c (working copy) @@ -46,7 +46,7 @@ int remaining = buf->ep - buf->wp; int available = stm->buffer->wp - stm->buffer->rp; - if (available == 0 && remaining > 0) + if ((available == 0) && (remaining > 0)) { int c = fz_readbytex(stm); if (c == EOF) @@ -62,7 +62,7 @@ buf->wp += MIN(remaining, available); stm->buffer->rp += MIN(remaining, available); - if (stm->buffer->rp == stm->buffer->wp && stm->buffer->eof) + if ((stm->buffer->rp == stm->buffer->wp) && (stm->buffer->eof)) return EOF; return 0; } Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_print.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_print.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/obj_print.c (working copy) @@ -18,33 +18,33 @@ static inline int iswhite(int ch) { return - ch == '\000' || - ch == '\011' || - ch == '\012' || - ch == '\014' || - ch == '\015' || - ch == '\040'; + (ch == '\000') || + (ch == '\011') || + (ch == '\012') || + (ch == '\014') || + (ch == '\015') || + (ch == '\040'); } static inline int isdelim(int ch) { - return ch == '(' || ch == ')' || - ch == '<' || ch == '>' || - ch == '[' || ch == ']' || - ch == '{' || ch == '}' || - ch == '/' || - ch == '%'; + return (ch == '(') || (ch == ')') || + (ch == '<') || (ch == '>') || + (ch == '[') || (ch == ']') || + (ch == '{') || (ch == '}') || + (ch == '/') || + (ch == '%'); } static inline void fmtputc(struct fmt *fmt, int c) { - if (fmt->sep && !isdelim(fmt->last) && !isdelim(c)) { + if ((fmt->sep) && (!isdelim(fmt->last)) && (!isdelim(c))) { fmt->sep = 0; fmtputc(fmt, ' '); } fmt->sep = 0; - if (fmt->buf && fmt->len < fmt->cap) + if ((fmt->buf) && (fmt->len < fmt->cap)) fmt->buf[fmt->len] = c; if (c == '\n') @@ -100,7 +100,7 @@ fmtputs(fmt, "\\("); else if (c == ')') fmtputs(fmt, "\\)"); - else if (c < 32 || c > 126) { + else if ((c < 32) || (c > 126)) { char buf[16]; fmtputc(fmt, '\\'); sprintf(buf, "%o", c); @@ -138,8 +138,8 @@ for (i = 0; s[i]; i++) { - if (isdelim(s[i]) || iswhite(s[i]) || - s[i] == '#' || s[i] < 32 || s[i] > 127) + if ((isdelim(s[i])) || (iswhite(s[i])) || + (s[i] == '#') || (s[i] < 32) || (s[i] > 127)) { fmtputc(fmt, '#'); c = (s[i] >> 4) & 0xf; @@ -205,11 +205,11 @@ fmtindent(fmt); fmtobj(fmt, key); fmtputc(fmt, ' '); - if (!fz_isindirect(val) && fz_isarray(val)) + if ((!fz_isindirect(val)) && (fz_isarray(val))) fmt->indent ++; fmtobj(fmt, val); fmtputc(fmt, '\n'); - if (!fz_isindirect(val) && fz_isarray(val)) + if ((!fz_isindirect(val)) && (fz_isarray(val))) fmt->indent --; } fmt->indent --; @@ -302,7 +302,7 @@ fmt.len = 0; fmtobj(&fmt, obj); - if (fmt.buf && fmt.len < fmt.cap) + if ((fmt.buf) && (fmt.len < fmt.cap)) fmt.buf[fmt.len] = '\0'; return fmt.len; Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_image.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_image.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_image.c (working copy) @@ -11,7 +11,7 @@ void fz_dropimage(fz_image *image) { - if (image && --image->refs == 0) + if ((image) && (--image->refs == 0)) { if (image->freefunc) image->freefunc(image); Index: PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_shade.c =================================================================== --- PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_shade.c (revision 51690) +++ PROTO/epdf/src/lib/mupdf/mupdf-0.5/fitz/res_shade.c (working copy) @@ -11,7 +11,7 @@ void fz_dropshade(fz_shade *shade) { - if (shade && --shade->refs == 0) + if ((shade) && (--shade->refs == 0)) { if (shade->cs) fz_dropcolorspace(shade->cs); Index: elmdentica/src/settings.c =================================================================== --- elmdentica/src/settings.c (revision 51690) +++ elmdentica/src/settings.c (working copy) @@ -553,7 +553,7 @@ if(user_data_dialog) { evas_object_smart_callback_add(user_data_dialog, "delete-request", user_data_dialog_win_del, NULL); - if(strlen(proto) == 5 && strncmp("https", proto, 5) == 0) + if((strlen(proto) == 5) && (strncmp("https", proto, 5) == 0)) box = account_dialog(user_data_dialog, screen_name, password, type, TRUE, domain, base_url, enabled, (Evas_Object*)data, receive, send); else box = account_dialog(user_data_dialog, screen_name, password, type, FALSE, domain, base_url, enabled, (Evas_Object*)data, receive, send); @@ -962,7 +962,7 @@ elm_hoversel_hover_end(hoversel); if(have_browser) { - if(settings->browser >= 0 && settings->browser <= browsersIndex) + if((settings->browser >= 0) && (settings->browser <= browsersIndex)) elm_hoversel_label_set(hoversel, browserNames[settings->browser]); else elm_hoversel_label_set(hoversel, _("Please choose a browser")); @@ -1407,7 +1407,7 @@ } void ed_settings_shutdown(void) { - if(settings && !eet_data_write(conf_file, settings_edd, "/settings", (void*)settings, 0)) + if((settings) && (!eet_data_write(conf_file, settings_edd, "/settings", (void*)settings, 0))) fprintf(stderr, "Failed to save settings."); eet_close(conf_file); eet_data_descriptor_free(settings_edd); @@ -1426,7 +1426,7 @@ } res = asprintf(&path, "%s/cache/icons", home); - if( res == -1 || !ecore_file_mkpath(path)) { + if( (res == -1) || (!ecore_file_mkpath(path))) { fprintf(stderr, (res==-1)?_("Can't create preferences directories since asprintf failed\n"):_("Can't create preferences directories since ecore_file_mkpath failed\n")); ecore_file_shutdown(); exit(1); @@ -1500,7 +1500,7 @@ } case 'm': { mm = strtol(optarg, NULL, 10); - if(mm > INT_MIN && mm < INT_MAX) + if((mm > INT_MIN) && (mm < INT_MAX)) settings->max_messages = (int)mm; break; } Index: elmdentica/src/twitter.c =================================================================== --- elmdentica/src/twitter.c (revision 51690) +++ elmdentica/src/twitter.c (working copy) @@ -81,7 +81,7 @@ sqlite3_bind_int64(*insert_stmt, 6, status->user_id); sqlite_res = sqlite3_step(*insert_stmt); - if(sqlite_res != 0 && sqlite_res != 101 ) printf("ERROR: %d while inserting message:\n(%s) %s\n",sqlite_res, status->screen_name,status->text); + if((sqlite_res != 0) && (sqlite_res != 101) ) printf("ERROR: %d while inserting message:\n(%s) %s\n",sqlite_res, status->screen_name,status->text); sqlite3_reset(*insert_stmt); } @@ -127,11 +127,11 @@ request = calloc(1, sizeof(http_request)); - if(request && strlen(msg) > 0) { + if((request) && (strlen(msg) > 0)) { if(reply_id>0) { res = asprintf(&ub_status, "source=%s&status=%s&in_reply_to_status_id=%lld", PACKAGE, msg, reply_id); reply_id=0; - } else if(user_id>0 || dm_to) + } else if((user_id>0) || (dm_to)) res = asprintf(&ub_status, "source=%s&text=%s", PACKAGE, msg); else res = asprintf(&ub_status, "source=%s&status=%s", PACKAGE, msg); @@ -445,7 +445,7 @@ } screen_name_obj = json_object_object_get(json_stream, "screen_name"); - if(screen_name_obj && strncmp(user->screen_name, json_object_get_string(screen_name_obj), strlen(user->screen_name)) == 0 ) { + if((screen_name_obj) && (strncmp(user->screen_name, json_object_get_string(screen_name_obj), strlen(user->screen_name)) == 0) ) { json_object_put(screen_name_obj); obj = json_object_object_get(json_stream, "name"); @@ -576,7 +576,7 @@ res = asprintf(&request->url, "%s://%s:%d%s/friendships/create.json?screen_name=%s", proto, domain, port, base_url, user_screen_name); if(res != -1) { ed_curl_post(screen_name, password, request, "", account_id); - if(debug && request->response_code != 200) + if((debug) && (request->response_code != 200)) printf("User follow failed with response code %ld\n", request->response_code); free(request->url); } @@ -589,7 +589,7 @@ res = asprintf(&request->url, "%s://%s:%d%s/friendships/destroy.json?screen_name=%s", proto, domain, port, base_url, user_screen_name); if(res != -1) { ed_curl_post(screen_name, password, request, "", account_id); - if(debug && request->response_code != 200) + if((debug) && (request->response_code != 200)) printf("User abandon failed with response code %ld\n", request->response_code); free(request->url); } Index: elmdentica/src/curl.c =================================================================== --- elmdentica/src/curl.c (revision 51690) +++ elmdentica/src/curl.c (working copy) @@ -142,7 +142,7 @@ curl_easy_setopt(ua, CURLOPT_WRITEFUNCTION, write_data ); curl_easy_setopt(ua, CURLOPT_ENCODING, "" ); - if(account_id >= 0 && screen_name && password) { + if((account_id >= 0) && (screen_name) && (password)) { curl_easy_setopt(ua, CURLOPT_HTTPAUTH, CURLAUTH_BASIC ); curl_easy_setopt(ua, CURLOPT_USERNAME, screen_name ); curl_easy_setopt(ua, CURLOPT_PASSWORD, password ); @@ -165,7 +165,7 @@ if(!request) return 2; - if(!request->url || strlen(request->url) <= 0) + if((!request->url) || (strlen(request->url) <= 0)) return 3; if(!user_agents) user_agents = eina_hash_string_superfast_new(user_agent_free); @@ -196,7 +196,7 @@ if(res == 0) { res = curl_easy_getinfo(ua, CURLINFO_RESPONSE_CODE, &request->response_code); - if(CURLE_OK == curl_easy_getinfo(ua, CURLINFO_REDIRECT_URL, &redir_url) && redir_url) + if((CURLE_OK == curl_easy_getinfo(ua, CURLINFO_REDIRECT_URL, &redir_url)) && (redir_url)) request->redir_url = strdup(redir_url); if(debug > 3) printf("Response code: %ld\n", request->response_code); return(request->content.size>0?0:-1); @@ -214,7 +214,7 @@ if(!request) return 2; - if(!request->url || strlen(request->url) <= 0) + if((!request->url) || (strlen(request->url) <= 0)) return 3; if(!user_agents) user_agents = eina_hash_int32_new(user_agent_free); @@ -243,7 +243,7 @@ curl_easy_getinfo(ua, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &content_length); curl_easy_getinfo(ua, CURLINFO_REDIRECT_URL, &request->redir_url); - if((res == 18 && content_length != -1) || res != 0) { + if(((res == 18) && (content_length != -1)) || (res != 0)) { show_curl_error(res, &(request->content)); return(4); } else { Index: elmdentica/src/elmdentica.c =================================================================== --- elmdentica/src/elmdentica.c (revision 51690) +++ elmdentica/src/elmdentica.c (working copy) @@ -646,7 +646,7 @@ struct tm date_tm; int res = 0; - if(nick && (bubble = elm_bubble_add(parent))) { + if((nick) && (bubble = elm_bubble_add(parent))) { evas_object_size_hint_weight_set(bubble, 1, 0); evas_object_size_hint_align_set(bubble, -1, -1); @@ -662,7 +662,7 @@ res = asprintf(&file_path, "%s/cache/icons/%s", home, nick); - if(res != -1 && (icon = elm_icon_add(parent))) { + if((res != -1) && (icon = elm_icon_add(parent))) { elm_icon_file_set(icon, file_path, "fubar?"); evas_object_show(icon); evas_object_smart_callback_add(icon, "clicked", on_bubble_icon_clicked, bubble); @@ -717,7 +717,7 @@ res = asprintf(&path, "%s/cache/icons/%s", home, user->screen_name); - if(res!=-1 && stat(path, &buf) == 0 ) { + if((res!=-1) && (stat(path, &buf) == 0) ) { icon = elm_icon_add(user_win); evas_object_size_hint_weight_set(icon, 1, 1); evas_object_size_hint_align_set(icon, -1, -1); @@ -746,7 +746,7 @@ evas_object_size_hint_weight_set(button, 1, 1); evas_object_size_hint_align_set(button, 0.5, 0); - if(!user->following && !user->protected) { + if((!user->following) && (!user->protected)) { elm_button_label_set(button, _("Follow")); evas_object_smart_callback_add(button, "clicked", on_user_follow, ubBubble); } else { @@ -756,7 +756,7 @@ elm_table_pack(table, button, 1, 1, 1, 1); evas_object_show(button); - if(user->text && (button = ed_make_bubble(user_win, user->screen_name, user->status_created_at, NULL))) { + if((user->text) && (button = ed_make_bubble(user_win, user->screen_name, user->status_created_at, NULL))) { message = ed_make_message(user->text, button, user_win); evas_object_show(button); if(message) { @@ -831,7 +831,7 @@ ed_statusnet_group_leave(ubBubble->account_id, gp); - if(gp->failed && debug) + if((gp->failed) && (debug)) printf("Error leaving group %s: %s\n", gp->name, gp->error); else { if(gp->member) @@ -910,7 +910,7 @@ res = asprintf(&path, "%s/cache/icons/%s", home, gp->name); - if(res != -1 && stat(path, &buf) == 0 ) { + if((res != -1) && (stat(path, &buf) == 0) ) { icon = elm_icon_add(group_win); evas_object_size_hint_weight_set(icon, 1, 1); evas_object_size_hint_align_set(icon, -1, -1); @@ -1080,7 +1080,7 @@ AnchorData *anchor=calloc(1, sizeof(AnchorData)); char *url=NULL; - if(!info->name || strlen(info->name) <= 9) + if((!info->name) || (strlen(info->name) <= 9)) return; url = strndup(1+(char*)info->name,strlen((char*)info->name)-2); @@ -1156,7 +1156,7 @@ mouse_x=m_x; mouse_y=m_y; - if( time_delta < 0.25 || time_delta >= 0.8 ) return; + if( (time_delta < 0.25) || (time_delta >= 0.8) ) return; else mouse_held_down=0; hover = elm_hover_add(win); @@ -1229,10 +1229,10 @@ if(debug > 2) printf("(%s|%s|%s) ~ %s ?", sn, gd->name, gd->message, pattern); // only do costly matches if there's isn't a match already - if( gd->match == EINA_FALSE && - (g_regex_match_simple(pattern, sn, G_REGEX_CASELESS, 0) || - g_regex_match_simple(pattern, gd->name, G_REGEX_CASELESS, 0) || - g_regex_match_simple(pattern, gd->message, G_REGEX_CASELESS, 0))) { + if( (gd->match == EINA_FALSE) && + ((g_regex_match_simple(pattern, sn, G_REGEX_CASELESS, 0)) || + (g_regex_match_simple(pattern, gd->name, G_REGEX_CASELESS, 0)) || + (g_regex_match_simple(pattern, gd->message, G_REGEX_CASELESS, 0)))) { gd->match = EINA_TRUE; if(debug > 2) printf(" %s\n", "Yes"); } else if(debug > 2) printf(" %s\n", "No"); @@ -1548,7 +1548,7 @@ } if(res != 0) { - if( msg && strlen(msg) > 0 ) { + if( (msg) && (strlen(msg) > 0) ) { if(dm_to) { sqlite_res = asprintf(&query, "INSERT INTO posts (account_id, dm_to, message) VALUES (%d, '%s', ?);", id, dm_to); dm_to=NULL; @@ -1580,7 +1580,7 @@ Evas_Object *dm_entry = e?evas_object_name_find(e, "dm_entry"):NULL; const char* dm_entry_str = dm_entry?elm_entry_entry_get(dm_entry):NULL; - if(dm_entry_str && strlen(dm_entry_str) > 0) { + if((dm_entry_str) && (strlen(dm_entry_str) > 0)) { dm_to = strdup(dm_entry_str); if(debug) printf("Sending a DM to %s\n", dm_to); } @@ -1701,7 +1701,7 @@ else len = strlen(first); - if(first_message && strncmp(msg,first,len) == 0) { + if((first_message) && (strncmp(msg,first,len) == 0)) { elm_entry_entry_set(entry, ""); first_message=0; } Index: elmdentica/src/statusnet.c =================================================================== --- elmdentica/src/statusnet.c (revision 51690) +++ elmdentica/src/statusnet.c (working copy) @@ -211,7 +211,7 @@ if (debug) printf("gnome-open %s\n", request->url); res = ed_curl_get(screen_name, password, request, gg->account_id); - while(request->redir_url && redir--) { + while((request->redir_url) && (redir--)) { free(request->url); request->url = request->redir_url; request->redir_url = NULL; Index: elicit/src/bin/palette.c =================================================================== --- elicit/src/bin/palette.c (revision 51690) +++ elicit/src/bin/palette.c (working copy) @@ -143,14 +143,14 @@ if (!f) return -1; buf[0] = 0; - if (fgets(buf, sizeof(buf), f) && strncmp("GIMP Palette", buf, 12)) return -2; + if ((fgets(buf, sizeof(buf), f)) && (strncmp("GIMP Palette", buf, 12))) return -2; palette_clear(palette); while(fgets(buf, sizeof(buf), f)) { int num; - if (buf[0] == '#' || buf[0] == '\n') continue; + if ((buf[0] == '#') || (buf[0] == '\n')) continue; num = sscanf(buf, "%3d %3d %3d\t%1024s\n", &r, &g, &b, name); Index: elicit/src/bin/config.c =================================================================== --- elicit/src/bin/config.c (revision 51690) +++ elicit/src/bin/config.c (working copy) @@ -34,7 +34,7 @@ line++; len = strlen(buf); - if (buf[0] == '#' || buf[0] == '\n') + if ((buf[0] == '#') || (buf[0] == '\n')) continue; /* chomp */ @@ -53,7 +53,7 @@ } } - if (!key || !val) + if ((!key) || (!val)) { fprintf(stderr, "[Elicit] Invalid line in config file (%d)\n", line); continue; Index: elicit/src/bin/elicit.c =================================================================== --- elicit/src/bin/elicit.c (revision 51690) +++ elicit/src/bin/elicit.c (working copy) @@ -42,7 +42,7 @@ ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - if (el->conf.w == w && el->conf.h == h) return; + if ((el->conf.w == w) && (el->conf.h == h)) return; if (el->obj.main) evas_object_resize(el->obj.main, w, h); @@ -100,7 +100,7 @@ if (!strcmp(tok, "magnify")) { tok = strtok(NULL, ","); - if (tok && !strcmp(tok, "start")) + if ((tok) && (!strcmp(tok, "start"))) { if (!el->band) el->band = elicit_band_new(el->path.theme); @@ -109,7 +109,7 @@ elicit_band_show(el->band); el->state.magnifying = 1; } - else if (tok && !strcmp(tok, "stop")) + else if ((tok) && (!strcmp(tok, "stop"))) { elicit_band_hide(el->band); el->state.magnifying = 0; @@ -122,9 +122,9 @@ else if (!strcmp(tok, "pick")) { tok = strtok(NULL, ","); - if (tok && !strcmp(tok, "start")) + if ((tok) && (!strcmp(tok, "start"))) el->state.picking = 1; - else if (tok && !strcmp(tok, "stop")) + else if ((tok) && (!strcmp(tok, "stop"))) el->state.picking = 0; else invalid = 1; @@ -133,9 +133,9 @@ else if (!strcmp(tok, "scroll")) { tok = strtok(NULL, ","); - if (tok && !strcmp(tok, "up")) + if ((tok) && (!strcmp(tok, "up"))) elicit_scroll(el, source, 1); - else if (tok && !strcmp(tok, "down")) + else if ((tok) && (!strcmp(tok, "down"))) elicit_scroll(el, source, -1); else invalid = 1; @@ -145,7 +145,7 @@ else if (!strcmp(tok, "palette")) { tok = strtok(NULL, ","); - if (tok && !strcmp(tok, "add")) + if ((tok) && (!strcmp(tok, "add"))) { Color *c; @@ -154,7 +154,7 @@ palette_view_select(el->obj.palette, c); color_unref(c); // (the palette retains a ref) } - else if (tok && !strcmp(tok, "remove")) + else if ((tok) && (!strcmp(tok, "remove"))) { Color *c; c = palette_view_selected(el->obj.palette); @@ -165,15 +165,15 @@ palette_view_select(el->obj.palette, NULL); } } - else if (tok && !strcmp(tok, "columns")) + else if ((tok) && (!strcmp(tok, "columns"))) { int col; tok = strtok(NULL, ","); col = palette_columns_get(el->palette); - if (tok && !strcmp(tok, "up")) + if ((tok) && (!strcmp(tok, "up"))) col += 1; - else if (tok && !strcmp(tok, "down")) + else if ((tok) && (!strcmp(tok, "down"))) col -= 1; palette_columns_set(el->palette, col); @@ -187,15 +187,15 @@ else if (!strcmp(tok, "band")) { tok = strtok(NULL, ","); - if (tok && !strcmp(tok, "toggle")) + if ((tok) && (!strcmp(tok, "toggle"))) { elicit_show_band_set(el, !el->conf.show_band); } - else if (tok && !strcmp(tok, "on")) + else if ((tok) && (!strcmp(tok, "on"))) { elicit_show_band_set(el, 1); } - else if (tok && !strcmp(tok, "off")) + else if ((tok) && (!strcmp(tok, "off"))) { elicit_show_band_set(el, 0); } @@ -205,15 +205,15 @@ else if (!strcmp(tok, "grid")) { tok = strtok(NULL, ","); - if (tok && !strcmp(tok, "toggle")) + if ((tok) && (!strcmp(tok, "toggle"))) { elicit_grid_visible_set(el, !el->conf.grid_visible); } - else if (tok && !strcmp(tok, "on")) + else if ((tok) && (!strcmp(tok, "on"))) { elicit_grid_visible_set(el, 1); } - else if (tok && !strcmp(tok, "off")) + else if ((tok) && (!strcmp(tok, "off"))) { elicit_grid_visible_set(el, 0); } @@ -230,7 +230,7 @@ else if (!strcmp(tok, "hex")) { tok = strtok(NULL, ","); - if (tok && !strcmp(tok, "copy")) + if ((tok) && (!strcmp(tok, "copy"))) { Ecore_X_Window win; const char *hex; @@ -559,13 +559,13 @@ if (el->path.confdir) { snprintf(buf, sizeof(buf), "%s/themes/%s.edj", el->path.confdir, theme); - if (ecore_file_exists(buf) && edje_file_group_exists(buf, "elicit.main")) + if ((ecore_file_exists(buf)) && (edje_file_group_exists(buf, "elicit.main"))) return buf; } // check in sys dir snprintf(buf, sizeof(buf), "%s/themes/%s.edj", el->path.datadir, theme); - if (ecore_file_exists(buf) && edje_file_group_exists(buf, "elicit.main")) + if ((ecore_file_exists(buf)) && (edje_file_group_exists(buf, "elicit.main"))) return buf; return NULL; @@ -801,7 +801,7 @@ { BrInitError error; - if (!br_init(&error) && error != BR_INIT_ERROR_DISABLED) + if ((!br_init(&error)) && (error != BR_INIT_ERROR_DISABLED)) fprintf(stderr, "[Elicit] Failed to initialize binreloc (error code: %d)\nFalling back to hardcoded paths.", error); if (!eina_init()) Index: elicit/src/bin/shot.c =================================================================== --- elicit/src/bin/shot.c (revision 51690) +++ elicit/src/bin/shot.c (working copy) @@ -153,7 +153,7 @@ sh = evas_object_smart_data_get(o); // don't grab same region twice - if (!force && (x == sh->cur.x && y == sh->cur.y && w == sh->cur.w && h == sh->cur.h)) + if ((!force) && ((x == sh->cur.x) && (y == sh->cur.y) && (w == sh->cur.w) && (h == sh->cur.h))) return; sh->iw = w; @@ -588,7 +588,7 @@ evas_object_show(sh->obj); evas_object_show(sh->clip); evas_object_show(sh->event); - if (sh->has_data && sh->grid_visible) + if ((sh->has_data) && (sh->grid_visible)) evas_object_show(sh->grid); else evas_object_hide(sh->grid); Index: elicit/src/bin/color.c =================================================================== --- elicit/src/bin/color.c (revision 51690) +++ elicit/src/bin/color.c (working copy) @@ -141,10 +141,10 @@ { color->mode = COLOR_MODE_RGBA; - if (r >= 0 && r <= 255) color->r = r; - if (g >= 0 && g <= 255) color->g = g; - if (b >= 0 && b <= 255) color->b = b; - if (a >= 0 && a <= 255) color->a = a; + if ((r >= 0) && (r <= 255)) color->r = r; + if ((g >= 0) && (g <= 255)) color->g = g; + if ((b >= 0) && (b <= 255)) color->b = b; + if ((a >= 0) && (a <= 255)) color->a = a; evas_color_rgb_to_hsv(color->r, color->g, color->b, &(color->h), &(color->s), &(color->v)); color_changed(color); } @@ -163,10 +163,10 @@ color_hsva_set(Color *color, float h, float s, float v, int a) { color->mode = COLOR_MODE_HSVA; - if (h >= 0 && h <= 360) color->h = h; - if (s >= 0 && s <= 1) color->s = s; - if (v >= 0 && v <= 1) color->v = v; - if (a >= 0 && a <= 255) color->a = a; + if ((h >= 0) && (h <= 360)) color->h = h; + if ((s >= 0) && (s <= 1)) color->s = s; + if ((v >= 0) && (v <= 1)) color->v = v; + if ((a >= 0) && (a <= 255)) color->a = a; evas_color_hsv_to_rgb(color->h, color->s, color->v, &(color->r), &(color->g), &(color->b)); color_changed(color); } Index: elicit/src/bin/pan.c =================================================================== --- elicit/src/bin/pan.c (revision 51690) +++ elicit/src/bin/pan.c (working copy) @@ -228,7 +228,7 @@ static void _smart_child_fill(E_Smart_Data *sd) { - if (sd->fill_x || sd->fill_y) + if ((sd->fill_x) || (sd->fill_y)) { Evas_Coord w, h; evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h); Index: elicit/src/bin/cslider.c =================================================================== --- elicit/src/bin/cslider.c (revision 51690) +++ elicit/src/bin/cslider.c (working copy) @@ -41,7 +41,7 @@ cs = evas_object_smart_data_get(o); - if (cs->gui && cs->spectrum) + if ((cs->gui) && (cs->spectrum)) edje_object_part_unswallow(cs->gui, cs->spectrum); if(!edje_object_file_set(cs->gui, file, group)) Index: elicit/src/bin/palette_view.c =================================================================== --- elicit/src/bin/palette_view.c (revision 51690) +++ elicit/src/bin/palette_view.c (working copy) @@ -188,7 +188,7 @@ pv_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { API_ENTRY(); - if (pv->x == x && pv->y == y) return; + if ((pv->x == x) && (pv->y == y)) return; pv->x = x; pv->y = y; pv_layout(obj); @@ -198,7 +198,7 @@ pv_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { API_ENTRY(); - if (pv->w == w && pv->h == h) return; + if ((pv->w == w) && (pv->h == h)) return; pv->w = w; pv->h = h; pv_layout(obj); @@ -260,7 +260,7 @@ x = y = w = h = adj = 0; lr = NULL; - if (pv->palette && pv->theme.file && pv->theme.group) + if ((pv->palette) && (pv->theme.file) && (pv->theme.group)) { clip = evas_object_clip_get(pv->smart_obj); Index: elicit/src/bin/binreloc.c =================================================================== --- elicit/src/bin/binreloc.c (revision 51690) +++ elicit/src/bin/binreloc.c (working copy) @@ -156,7 +156,7 @@ path = strchr (line, '/'); /* Sanity check. */ - if (!strstr(line, " r-xp ") || !path) { + if ((!strstr(line, " r-xp ")) || (!path)) { fclose (f); free (line); if (error) @@ -209,7 +209,7 @@ break; /* Sanity check. */ - if (!strstr(line, " r-xp ") || !strchr(line, '/')) + if ((!strstr(line, " r-xp ")) || (!strchr(line, '/'))) continue; /* Parse line. */ @@ -218,7 +218,7 @@ file = strchr (line, '/'); /* More sanity check. */ - if (!(file > end_addr && end_addr && end_addr[0] == '-')) + if (!((file > end_addr) && (end_addr) && (end_addr[0] == '-'))) continue; end_addr[0] = '\0'; @@ -236,7 +236,7 @@ /* Get rid of "(deleted)" from the filename. */ len = strlen (file); - if (len > 10 && strcmp (file + len - 10, " (deleted)") == 0) + if ((len > 10) && (strcmp (file + len - 10, " (deleted)") == 0)) file[len - 10] = '\0'; /* I don't know whether this can happen but better safe than sorry. */ @@ -263,7 +263,7 @@ sscanf (address_string, "%p", &end_addr_p); - if (symbol >= start_addr_p && symbol < end_addr_p) { + if ((symbol >= start_addr_p) && (symbol < end_addr_p)) { found = file; break; } @@ -690,7 +690,7 @@ int must_free = 0; len = strlen (dir); - if (len > 0 && dir[len - 1] != '/') { + if ((len > 0) && (dir[len - 1] != '/')) { dir2 = br_strcat (dir, "/"); must_free = 1; } else @@ -750,7 +750,7 @@ if (end == (const char *) NULL) return strdup ("."); - while (end > path && *end == '/') + while ((end > path) && (*end == '/')) end--; result = br_strndup (path, end - path + 1); if (result[0] == 0) { Index: E-MODULES-EXTRA/diskio/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/diskio/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/diskio/src/e_mod_main.c (working copy) @@ -273,7 +273,7 @@ fclose (statfile); - if (!bytes_r_new && !bytes_w_new) + if ((!bytes_r_new) && (!bytes_w_new)) { edje_object_signal_emit(inst->o_diskio, "read,off", ""); edje_object_signal_emit(inst->o_diskio, "write,off", ""); Index: E-MODULES-EXTRA/language/src/e_mod_lang.c =================================================================== --- E-MODULES-EXTRA/language/src/e_mod_lang.c (revision 51690) +++ E-MODULES-EXTRA/language/src/e_mod_lang.c (working copy) @@ -82,7 +82,7 @@ for (l = cfg->l.border_lang_setup; l; l = l->next) { bls = l->data; - if (bls && (bls->bd = bd)) + if ((bls) && (bls->bd = bd)) { if (!n) { @@ -240,7 +240,7 @@ break; } - if (lp->lang_name && lp->lang_shortcut && lp->kbd_layout) + if ((lp->lang_name) && (lp->lang_shortcut) && (lp->kbd_layout)) _lang_load_xfree_language_register_language(cfg, lp->lang_name, lp->lang_shortcut, lp->lang_flag, lp->kbd_layout, lp->kbd_variant); @@ -335,14 +335,14 @@ eina_stringshare_add(lng_xml->current->value); } - if (lkm->kbd_model && lkm->kbd_model_description) + if ((lkm->kbd_model) && (lkm->kbd_model_description)) break; if (!language_next(lng_xml)) break; } - if (lkm->kbd_model && lkm->kbd_model_description) + if ((lkm->kbd_model) && (lkm->kbd_model_description)) cfg->language_kbd_model_list = eina_list_append(cfg->language_kbd_model_list, lkm); else @@ -459,7 +459,7 @@ _lang_load_xfree_language_kbd_layouts_load_configItem(Language_XML *xml, Language_Predef *lp) { Language_XML_Node *current_node; - if (!xml || !lp) return; + if ((!xml) || (!lp)) return; if (strcasecmp(xml->current->tag, "configItem")) return; @@ -511,7 +511,7 @@ } } - if (lp->lang_name && lp->lang_shortcut && lp->kbd_layout) + if ((lp->lang_name) && (lp->lang_shortcut) && (lp->kbd_layout)) break; if (!language_next(xml)) @@ -523,7 +523,7 @@ _lang_load_xfree_language_kbd_layouts_load_variantList(Language_XML *xml, Language_Predef *lp) { Language_XML_Node *current_node; - if (!xml || !lp) return; + if ((!xml) || (!lp)) return; if (strcasecmp(xml->current->tag, "variantList")) return; @@ -571,9 +571,9 @@ Eina_List *l; int found = 0; - if (!lang_name || !lang_shortcut || !kbd_layout) return; + if ((!lang_name) || (!lang_shortcut) || (!kbd_layout)) return; - for (l = cfg->language_predef_list; l && !found; l = l->next) + for (l = cfg->language_predef_list; (l) && (!found); l = l->next) { lp = l->data; @@ -772,7 +772,7 @@ bd = NULL; } - if (!bd && conf->language_selector) + if ((!bd) && (conf->language_selector)) lang_language_switch_to(conf, 0); return 1; @@ -798,7 +798,7 @@ for (l = conf->l.border_lang_setup; l; l = l->next) { bls = l->data; - if (bls->bd == e->border && (bls->language_selector != conf->language_selector)) + if ((bls->bd == e->border) && (bls->language_selector != conf->language_selector)) { Language *lang; @@ -811,7 +811,7 @@ bls = NULL; } - if (!bls && conf->language_selector) + if ((!bls) && (conf->language_selector)) { conf->language_selector = 0; _lang_apply_language_settings(conf->languages->data); @@ -846,7 +846,7 @@ } } - if (!e_border_focused_get() && conf->language_selector) + if ((!e_border_focused_get()) && (conf->language_selector)) lang_language_switch_to(conf, 0); return 1; @@ -861,7 +861,7 @@ e = ev; conf = data; - if (!e_border_focused_get() && conf->language_selector) + if ((!e_border_focused_get()) && (conf->language_selector)) lang_language_switch_to(conf, 0); return 1; Index: E-MODULES-EXTRA/language/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/language/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/language/src/e_mod_main.c (working copy) @@ -380,8 +380,8 @@ void language_register_callback_handlers() { - if (language_config->lang_policy == LS_GLOBAL_POLICY || - language_config->handlers) return; + if ((language_config->lang_policy == LS_GLOBAL_POLICY) || + (language_config->handlers)) return; language_config->handlers = eina_list_append (language_config->handlers, ecore_event_handler_add @@ -533,7 +533,7 @@ Language *lang; int indx; - if (!language_config || !mi) return; + if ((!language_config) || (!mi)) return; for (l = language_config->languages, indx = 0; l; l = l->next, indx ++) { Index: E-MODULES-EXTRA/language/src/e_mod_config.c =================================================================== --- E-MODULES-EXTRA/language/src/e_mod_config.c (revision 51690) +++ E-MODULES-EXTRA/language/src/e_mod_config.c (working copy) @@ -335,8 +335,8 @@ language_clear_border_language_setup_list(); language_unregister_callback_handlers(); - if (cfdata->conf->lang_policy == LS_WINDOW_POLICY || - cfdata->conf->lang_policy == LS_APPLICATION_POLICY) + if ((cfdata->conf->lang_policy == LS_WINDOW_POLICY) || + (cfdata->conf->lang_policy == LS_APPLICATION_POLICY)) { language_register_callback_handlers(); } @@ -530,7 +530,7 @@ if (!strcmp(var, "basic")) continue; - if (lang->rdefs.variant && !strcmp(lang->rdefs.variant, var)) + if ((lang->rdefs.variant) && (!strcmp(lang->rdefs.variant, var))) kbdv_i = i; e_widget_ilist_append(cfdata->gui.o_kbd_variant, NULL, var, @@ -563,9 +563,9 @@ static void _conf_up_button_availability_set(E_Config_Dialog_Data *cfdata) { - if (!e_widget_ilist_selected_label_get(cfdata->gui.o_slang) || - !e_widget_ilist_selected_get(cfdata->gui.o_slang) || - eina_list_count(cfdata->s_langs) < 1) + if ((!e_widget_ilist_selected_label_get(cfdata->gui.o_slang)) || + (!e_widget_ilist_selected_get(cfdata->gui.o_slang)) || + (eina_list_count(cfdata->s_langs) < 1)) e_widget_disabled_set(cfdata->gui.o_up, 1); else e_widget_disabled_set(cfdata->gui.o_up, 0); @@ -573,10 +573,10 @@ static void _conf_down_button_availability_set(E_Config_Dialog_Data *cfdata) { - if (!e_widget_ilist_selected_label_get(cfdata->gui.o_slang) || + if ((!e_widget_ilist_selected_label_get(cfdata->gui.o_slang)) || (e_widget_ilist_selected_get(cfdata->gui.o_slang) == e_widget_ilist_count(cfdata->gui.o_slang) - 1) || - eina_list_count(cfdata->s_langs) < 1) + (eina_list_count(cfdata->s_langs) < 1)) e_widget_disabled_set(cfdata->gui.o_down, 1); else e_widget_disabled_set(cfdata->gui.o_down, 0); Index: E-MODULES-EXTRA/language/src/e_mod_keybindings.c =================================================================== --- E-MODULES-EXTRA/language/src/e_mod_keybindings.c (revision 51690) +++ E-MODULES-EXTRA/language/src/e_mod_keybindings.c (working copy) @@ -114,8 +114,8 @@ { eb = l->data; - if (eb && eb->action && eb->action && - !strcmp(!eb->action ? "" : eb->action, !key->action ? "" : key->action)) + if ((eb) && (eb->action) && (eb->action) && + (!strcmp(!eb->action ? "" : eb->action, !key->action ? "" : key->action))) { if (save) { @@ -164,17 +164,17 @@ Eina_List *l; E_Config_Binding_Key *eb; - if (!key || !key->key || !key->key[0] || !action) return; + if ((!key) || (!key->key) || (!key->key[0]) || (!action)) return; CFG_KEYBIND(key->context, key->key, key->modifiers, key->any_mod, action, key->params); - for (l = e_config->key_bindings, found = 0; l && !found; l = l->next) + for (l = e_config->key_bindings, found = 0; (l) && (!found); l = l->next) { E_Config_Binding_Key *t = l->data; - if (!strcmp(!t->action ? "" : t->action, eb->action) && - !strcmp(!t->params ? "" : t->params, !eb->params ? "" : eb->params)) + if ((!strcmp(!t->action ? "" : t->action, eb->action)) && + (!strcmp(!t->params ? "" : t->params, !eb->params ? "" : eb->params))) found = 1; } Index: E-MODULES-EXTRA/language/src/e_mod_parse.c =================================================================== --- E-MODULES-EXTRA/language/src/e_mod_parse.c (revision 51690) +++ E-MODULES-EXTRA/language/src/e_mod_parse.c (working copy) @@ -83,7 +83,7 @@ return EINA_FALSE; } - if (!xml->current && xml->top) return EINA_FALSE; + if ((!xml->current) && (xml->top)) return EINA_FALSE; node = calloc(sizeof(Language_XML_Node), 1); if (!node) @@ -197,7 +197,7 @@ return EINA_FALSE; } - if (xml->current && xml->current->children) + if ((xml->current) && (xml->current->children)) if (eina_list_count(xml->current->children) > 0) ret = EINA_TRUE; else Index: E-MODULES-EXTRA/drawer/src/plugins/sources/directory_watcher.c =================================================================== --- E-MODULES-EXTRA/drawer/src/plugins/sources/directory_watcher.c (revision 51690) +++ E-MODULES-EXTRA/drawer/src/plugins/sources/directory_watcher.c (working copy) @@ -324,7 +324,7 @@ { char exec[PATH_MAX]; - if (inst->conf->fm && (inst->conf->fm[0] != '\0')) + if ((inst->conf->fm) && (inst->conf->fm[0] != '\0')) { snprintf(exec, PATH_MAX, "%s \"%s\"", inst->conf->fm, path); e_exec(zone, NULL, exec, NULL, NULL); @@ -336,7 +336,7 @@ act = e_action_find("fileman"); if (act) { - if (act && act->func.go) + if ((act) && (act->func.go)) act->func.go(E_OBJECT(e_manager_current_get()), path); } } @@ -639,7 +639,7 @@ d1 = ecore_file_is_dir(si1->data); d2 = ecore_file_is_dir(si2->data); - if (d1 && d2) + if ((d1) && (d2)) return strcmp(si1->data, si2->data); if (d1) Index: E-MODULES-EXTRA/drawer/src/plugins/views/grid.c =================================================================== --- E-MODULES-EXTRA/drawer/src/plugins/views/grid.c (revision 51690) +++ E-MODULES-EXTRA/drawer/src/plugins/views/grid.c (working copy) @@ -130,18 +130,18 @@ EINA_LIST_FOREACH(ll, l, si) { - if (!cat && si->category) + if ((!cat) && (si->category)) { cat = eina_stringshare_add(si->category); change = EINA_TRUE; } - else if (cat && !si->category) + else if ((cat) && (!si->category)) { eina_stringshare_del(cat); cat = NULL; change = EINA_TRUE; } - else if (cat && si->category && (strcmp(cat, si->category))) + else if ((cat) && (si->category) && (strcmp(cat, si->category))) { eina_stringshare_del(cat); cat = eina_stringshare_add(si->category); @@ -227,7 +227,7 @@ } if (resize) evas_object_resize(inst->o_box, w, h); - if (inst->items && !cath) + if ((inst->items) && (!cath)) { EINA_LIST_FOREACH(inst->items, l, e) { @@ -309,7 +309,7 @@ } else { - if (!ew && !eh) + if ((!ew) && (!eh)) evas_object_geometry_get(e->o_holder, NULL, NULL, &ew, &eh); evas_object_resize(e->o_holder, ew, eh); @@ -331,9 +331,9 @@ */ iter_count = max_item_count; - while ((!hh || ((double) ww / (double) hh) < 1.5) && cw < (zw - ew / 2) && (ww < catw || (iter_count && ww <= max_item_count * ew + ew / 2))) + while (((!hh) || (((double) ww / (double) hh) < 1.5)) && (cw < (zw - ew / 2)) && ((ww < catw) || ((iter_count) && (ww <= max_item_count * ew + ew / 2)))) { - if (max_item_count == 1 && ww < catw) + if ((max_item_count == 1) && (ww < catw)) cw = catw; else cw += ew; Index: E-MODULES-EXTRA/drawer/src/plugins/views/list.c =================================================================== --- E-MODULES-EXTRA/drawer/src/plugins/views/list.c (revision 51690) +++ E-MODULES-EXTRA/drawer/src/plugins/views/list.c (working copy) @@ -238,18 +238,18 @@ { Entry *e; - if (!cat && si->category) + if ((!cat) && (si->category)) { cat = eina_stringshare_add(si->category); change = EINA_TRUE; } - else if (cat && !si->category) + else if ((cat) && (!si->category)) { eina_stringshare_del(cat); cat = NULL; change = EINA_TRUE; } - else if (cat && si->category && (strcmp(cat, si->category))) + else if ((cat) && (si->category) && (strcmp(cat, si->category))) { eina_stringshare_del(cat); cat = eina_stringshare_add(si->category); Index: E-MODULES-EXTRA/drawer/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/drawer/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/drawer/src/e_mod_main.c (working copy) @@ -353,11 +353,11 @@ EINA_LIST_FOREACH(instances, l, inst) { - if (inst->view && inst->view->func.config_save) + if ((inst->view) && (inst->view->func.config_save)) inst->view->func.config_save(inst->view); - if (inst->source && inst->source->func.config_save) + if ((inst->source) && (inst->source->func.config_save)) inst->source->func.config_save(inst->source); - if (inst->composite && inst->composite->func.config_save) + if ((inst->composite) && (inst->composite->func.config_save)) inst->composite->func.config_save(inst->composite); } @@ -447,7 +447,7 @@ else if (cat == DRAWER_COMPOSITES) _drawer_composite_new(inst, name); - if ((inst->composite || (inst->source && inst->view))) + if (((inst->composite) || ((inst->source) && (inst->view)))) { if (inst->flags.is_floating) _drawer_container_update(inst); @@ -472,7 +472,7 @@ else if (cat == DRAWER_COMPOSITES) p = inst->composite; - if (p && p->func.config_get) + if ((p) && (p->func.config_get)) return p->func.config_get(p, evas); else return e_widget_label_add(evas, D_("The plugin is not configurable")); @@ -628,8 +628,8 @@ inst->o_content = drawer_util_icon_create(si, evas, 120, 120); edje_object_signal_emit(inst->o_content, "e,state,hide_info", "e"); } - else if (inst->composite && inst->composite->enabled && - DRAWER_COMPOSITE(inst->composite)->func.get_main_icon) + else if ((inst->composite) && (inst->composite->enabled) && + (DRAWER_COMPOSITE(inst->composite)->func.get_main_icon)) { inst->o_content = DRAWER_COMPOSITE(inst->composite)->func.get_main_icon( DRAWER_COMPOSITE(inst->composite), evas, 120, 120); @@ -824,7 +824,7 @@ { Evas_Object *o = NULL, *con = NULL; - if (inst->composite && inst->composite->enabled) + if ((inst->composite) && (inst->composite->enabled)) { Drawer_Composite *c = DRAWER_COMPOSITE(inst->composite); @@ -930,7 +930,7 @@ Instance *inst; inst = data; - if (inst->composite && inst->composite->enabled) + if ((inst->composite) && (inst->composite->enabled)) { if (DRAWER_COMPOSITE(inst->composite)->func.container_resized) DRAWER_COMPOSITE(inst->composite)->func.container_resized(DRAWER_COMPOSITE(inst->composite)); @@ -1019,7 +1019,7 @@ static void _drawer_plugin_destroy(Instance *inst, Drawer_Plugin *p) { - if (!p->enabled || p->error) return; + if ((!p->enabled) || (p->error)) return; if (p->func.config_save) p->func.config_save(p); p->func.shutdown(p); @@ -1075,7 +1075,7 @@ inst->conf_item->source = eina_stringshare_add(name); inst->source = p; - if (!p->error && (p->data = p->func.init(p, inst->conf_item->id))) + if ((!p->error) && (p->data = p->func.init(p, inst->conf_item->id))) { p->enabled = EINA_TRUE; @@ -1123,7 +1123,7 @@ inst->conf_item->view = eina_stringshare_add(name); inst->view = p; - if (!p->error && (p->data = p->func.init(p, inst->conf_item->id))) + if ((!p->error) && (p->data = p->func.init(p, inst->conf_item->id))) { p->enabled = EINA_TRUE; @@ -1171,7 +1171,7 @@ inst->conf_item->composite = eina_stringshare_add(name); inst->composite = p; - if (!p->error && (p->data = p->func.init(p, inst->conf_item->id))) + if ((!p->error) && (p->data = p->func.init(p, inst->conf_item->id))) { p->enabled = EINA_TRUE; @@ -1238,7 +1238,7 @@ _drawer_view_new(inst, inst->conf_item->view); } - if ((inst->composite || (inst->source && inst->view)) && inst->flags.is_floating) + if (((inst->composite) || (inst->source && (inst->view))) && (inst->flags.is_floating)) ecore_timer_add(0.5, _drawer_container_init_timer, inst); /* return the Gadget_Container Client */ @@ -1304,14 +1304,14 @@ inst = gcc->data; _drawer_container_setup(inst, orient); - if (inst->composite && inst->composite->enabled) + if ((inst->composite) && (inst->composite->enabled)) { if (DRAWER_COMPOSITE(inst->composite)->func.orient_set) DRAWER_COMPOSITE(inst->composite)->func.orient_set(DRAWER_COMPOSITE(inst->composite), orient); } else { - if (inst->view && DRAWER_VIEW(inst->view)->func.orient_set) + if ((inst->view) && (DRAWER_VIEW(inst->view)->func.orient_set)) DRAWER_VIEW(inst->view)->func.orient_set(DRAWER_VIEW(inst->view), orient); } @@ -1499,7 +1499,7 @@ if (!(strcmp(type, "edje"))) { edje_object_size_min_get(swallow, &w, &h); - if (!w || !h) + if ((!w) || (!h)) edje_object_size_min_calc(swallow, &w, &h); edje_extern_object_min_size_set(swallow, w, h); @@ -1605,8 +1605,8 @@ if (inst->flags.is_floating) { - if ((inst->composite && inst->composite->enabled) || - (inst->view && inst->view->enabled)) + if (((inst->composite) && (inst->composite->enabled)) || + ((inst->view) && (inst->view->enabled))) _drawer_container_update(inst); } else if (inst->popup) @@ -1686,7 +1686,7 @@ ev = event; inst = data; - if (!inst->popup || !inst->popup->win->visible || inst->flags.pop_showing) return EINA_TRUE; + if ((!inst->popup) || (!inst->popup->win->visible) || (inst->flags.pop_showing)) return EINA_TRUE; if (ev->event_window == inst->popup->win->evas_win) return EINA_TRUE; _drawer_popup_hide(inst); @@ -1725,9 +1725,9 @@ if (!(inst = data)) return; ev = event; - if (ev->button == 1 && !inst->flags.is_floating && - ((inst->composite && inst->composite->enabled) || - (inst->source && inst->view && inst->source->enabled && inst->view->enabled))) + if ((ev->button == 1) && (!inst->flags.is_floating) && + (((inst->composite) && (inst->composite->enabled)) || + ((inst->source) && (inst->view) && (inst->source->enabled) && (inst->view->enabled)))) { if (inst->flags.pop_hiding) return; if (!inst->popup) _drawer_popup_create(inst); @@ -1739,16 +1739,16 @@ _drawer_popup_show(inst); return; } - else if (ev->button == 2 && !inst->flags.is_floating) + else if ((ev->button == 2) && (!inst->flags.is_floating)) { - if (inst->composite && inst->composite->enabled) + if ((inst->composite) && (inst->composite->enabled)) { Drawer_Composite *c = DRAWER_COMPOSITE(inst->composite); if (c->func.trigger) c->func.trigger(c, inst->gcc->gadcon->zone); } - else if (inst->source && inst->view && inst->source->enabled && inst->view->enabled) + else if ((inst->source) && (inst->view) && (inst->source->enabled) && (inst->view->enabled)) { Drawer_Source *s = DRAWER_SOURCE(inst->source); Index: E-MODULES-EXTRA/notification/src/e_mod_popup.c =================================================================== --- E-MODULES-EXTRA/notification/src/e_mod_popup.c (revision 51690) +++ E-MODULES-EXTRA/notification/src/e_mod_popup.c (working copy) @@ -62,7 +62,7 @@ break; } - if (replaces_id && (popup = _notification_popup_find(replaces_id))) + if ((replaces_id) && (popup = _notification_popup_find(replaces_id))) { e_notification_ref(n); @@ -110,7 +110,7 @@ Eina_List *l, *next; Popup_Data *popup; - for (l = notification_cfg->popups; l && (popup = l->data); l = next) + for (l = notification_cfg->popups; (l) && (popup = l->data); l = next) { next = l->next; _notification_popdown(popup, E_NOTIFICATION_CLOSED_REQUESTED); @@ -170,7 +170,7 @@ return NULL; } - if (str1 && str2 && strcmp(str1, str2)) + if ((str1) && (str2) && (strcmp(str1, str2))) { /* printf("- summary doesn match, %s, %s\n", str1, str2); */ return NULL; @@ -336,7 +336,7 @@ errno = 0; width = strtol(app_icon_max, &endptr, 10); - if ((errno != 0 && width == 0) || endptr == app_icon_max) + if (((errno != 0) && (width == 0)) || (endptr == app_icon_max)) { width = 80; height = 80; @@ -350,7 +350,7 @@ } /* Check if the app specify an icon either by a path or by a hint */ - if ((icon_path = e_notification_app_icon_get(popup->notif)) && *icon_path) + if ((icon_path = e_notification_app_icon_get(popup->notif)) && (*icon_path)) { if (!strncmp(icon_path, "file://", 7)) icon_path += 7; if (!ecore_file_exists(icon_path)) @@ -410,7 +410,7 @@ w = width; h = height; } - if (w > width || h > height) + if ((w > width) || (h > height)) { int v; v = w > h ? w : h; Index: E-MODULES-EXTRA/notification/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/notification/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/notification/src/e_mod_main.c (working copy) @@ -181,7 +181,7 @@ popuped = notification_popup_notify(n, replaces_id, new_id, appname); stacked = notification_box_notify(n, replaces_id, new_id); - if (!popuped && !stacked) + if ((!popuped) && (!stacked)) { e_notification_hint_urgency_set(n, 4); notification_popup_notify(n, replaces_id, new_id, appname); @@ -330,10 +330,10 @@ E_CONFIG_LIST(D, T, items, conf_item_edd); notification_cfg = e_config_domain_load("module.notification", conf_edd); - if (notification_cfg && - !(e_util_module_config_check + if ((notification_cfg) && + (!(e_util_module_config_check (D_("Notification Module"), notification_cfg->version, - MOD_CFG_FILE_EPOCH, MOD_CFG_FILE_VERSION))) + MOD_CFG_FILE_EPOCH, MOD_CFG_FILE_VERSION)))) { _notification_cfg_free(notification_cfg); } Index: E-MODULES-EXTRA/notification/src/e_mod_box.c =================================================================== --- E-MODULES-EXTRA/notification/src/e_mod_box.c (revision 51690) +++ E-MODULES-EXTRA/notification/src/e_mod_box.c (working copy) @@ -83,7 +83,7 @@ Notification_Box_Icon *ic = NULL; b = l->data; - if (bd || replaces_id) + if ((bd) || (replaces_id)) ic = _notification_box_icon_find(b, bd, replaces_id); if (ic) { @@ -135,7 +135,7 @@ { b = l->data; - if (b->id && !strcmp(b->id, id)) + if ((b->id) && (!strcmp(b->id, id))) { _notification_box_free(b); notification_cfg->n_box = eina_list_remove(notification_cfg->n_box, b); @@ -193,7 +193,7 @@ { b = l->data; - if (b->id && !strcmp(b->id, id)) + if ((b->id) && (!strcmp(b->id, id))) { _notification_box_evas_set(b, evas); notification_box_show(b); @@ -433,11 +433,11 @@ Instance *inst; inst = l->data; - if (urgency == E_NOTIFICATION_URGENCY_LOW && inst->ci->store_low) + if ((urgency == E_NOTIFICATION_URGENCY_LOW) && (inst->ci->store_low)) n_box = eina_list_append(n_box, inst->n_box); - else if (urgency == E_NOTIFICATION_URGENCY_NORMAL && inst->ci->store_normal) + else if ((urgency == E_NOTIFICATION_URGENCY_NORMAL) && (inst->ci->store_normal)) n_box = eina_list_append(n_box, inst->n_box); - else if (urgency == E_NOTIFICATION_URGENCY_CRITICAL && inst->ci->store_critical) + else if ((urgency == E_NOTIFICATION_URGENCY_CRITICAL) && (inst->ci->store_critical)) n_box = eina_list_append(n_box, inst->n_box); } return n_box; @@ -510,7 +510,7 @@ Evas_Object *dummy = NULL; int w, h = 0; - if ((icon_path = e_notification_app_icon_get(n)) && *icon_path) + if ((icon_path = e_notification_app_icon_get(n)) && (*icon_path)) { if (!strncmp(icon_path, "file://", 7)) icon_path += 7; app_icon = evas_object_image_add(evas_object_evas_get(ic->n_box->o_box)); @@ -588,7 +588,7 @@ Notification_Box_Icon *ic; if (!(ic = l->data)) continue; - if (ic->border == bd || ic->n_id == n_id) + if ((ic->border == bd) || (ic->n_id == n_id)) return ic; } @@ -729,7 +729,7 @@ Notification_Box_Icon *ic; Config_Item *ci; - if (!(ic = data) || !ic->n_box || !ic->n_box->inst) return; + if ((!(ic = data)) || (!ic->n_box) || (!ic->n_box->inst)) return; if (!(ci = ic->n_box->inst->ci)) return; _notification_box_icon_signal_emit(ic, "e,state,focused", "e"); @@ -738,7 +738,7 @@ _notification_box_icon_fill_label(ic); _notification_box_icon_signal_emit(ic, "e,action,show,label", "e"); } - if (ci->show_popup && !ic->popup && !ic->mouse_in_timer) + if ((ci->show_popup) && (!ic->popup) && (!ic->mouse_in_timer)) ic->mouse_in_timer = ecore_timer_add(0.5, _notification_box_cb_icon_mouse_still_in, ic); } @@ -782,7 +782,7 @@ b = ic->n_box; if ((ev->button == 1)) { - if (b->inst->ci->focus_window && ic->border) + if ((b->inst->ci->focus_window) && (ic->border)) { e_border_uniconify(ic->border); e_desk_show(ic->border->desk); Index: E-MODULES-EXTRA/tiling/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/tiling/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/tiling/src/e_mod_main.c (working copy) @@ -52,9 +52,9 @@ #define TILE_LOOP_DESKCHECK if ((lbd->desk != bd->desk) || (lbd->zone != bd->zone)) continue; -#define TILE_LOOP_CHECKS(lbd) ((tinfo && eina_list_data_find(tinfo->floating_windows, lbd) == lbd) || \ +#define TILE_LOOP_CHECKS(lbd) (((tinfo) && (eina_list_data_find(tinfo->floating_windows, lbd) == lbd)) || \ (lbd->visible == 0) || \ - (!tiling_config->tile_dialogs && \ + ((!tiling_config->tile_dialogs) && \ ((lbd->client.icccm.transient_for != 0) || \ (lbd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)))) @@ -110,7 +110,7 @@ { struct _Config_vdesk *vd = l->data; if (!vd) continue; - if (vd->x == x && vd->y == y && vd->zone_num == zone_num) + if ((vd->x == x) && (vd->y == y) && (vd->zone_num == zone_num)) return vd; } @@ -157,7 +157,7 @@ void *data; int c; - if (!bd || !tinfo) return 0; + if ((!bd) || (!tinfo)) return 0; if (!(n = eina_list_data_find_list(tinfo->client_list, bd))) return 0; if (!(p = n->prev)) return 0; data = n->data; @@ -177,7 +177,7 @@ void *data; int c; - if (!bd || !tinfo) return 0; + if ((!bd) || (!tinfo)) return 0; if (!(n = eina_list_data_find_list(tinfo->client_list, bd))) return 0; if (!(p = n->next)) return 0; data = n->data; @@ -198,9 +198,9 @@ EINA_LIST_FOREACH(e_border_focus_stack_get(), l, lbd) { - if (exclude && + if ((exclude) && ((lbd == exclude) || (lbd->desk != exclude->desk))) continue; - if (!exclude && desk && (lbd->desk != desk)) continue; + if ((!exclude) && (desk) && (lbd->desk != desk)) continue; if (TILE_LOOP_CHECKS(lbd)) continue; return lbd; } @@ -211,14 +211,14 @@ static void toggle_floating(E_Border *bd) { - if (!bd || !tinfo) return; + if ((!bd) || (!tinfo)) return; if (eina_list_data_find(tinfo->floating_windows, bd) == bd) { tinfo->floating_windows = eina_list_remove(tinfo->floating_windows, bd); - if (!tiling_config->dont_touch_borders && - tiling_config->tiling_border && - (!bd->bordername || strcmp(bd->bordername, tiling_config->tiling_border))) + if ((!tiling_config->dont_touch_borders) && + (tiling_config->tiling_border) && + ((!bd->bordername) || (strcmp(bd->bordername, tiling_config->tiling_border)))) change_window_border(bd, tiling_config->tiling_border); e_border_idler_before(); rearrange_windows(bd, 0); @@ -229,9 +229,9 @@ /* To give the user a bit of feedback we restore the original border */ /* TODO: save the original border, don't just restore the default one */ tinfo->floating_windows = eina_list_prepend(tinfo->floating_windows, bd); - if (!tiling_config->dont_touch_borders && - tiling_config->floating_border && - (!bd->bordername || strcmp(bd->bordername, tiling_config->floating_border))) + if ((!tiling_config->dont_touch_borders) && + (tiling_config->floating_border) && + ((!bd->bordername) || (strcmp(bd->bordername, tiling_config->floating_border)))) change_window_border(bd, tiling_config->floating_border); e_border_idler_before(); e_border_resize(bd, w, h); @@ -253,11 +253,11 @@ TILE_LOOP_DESKCHECK; if (TILE_LOOP_CHECKS(lbd)) continue; - if (lbd->client.icccm.min_w > width || lbd->client.icccm.min_h > height) + if ((lbd->client.icccm.min_w > width) || (lbd->client.icccm.min_h > height)) { toggle_floating(lbd); /* If this was the window this call was about, we don't need to change anything */ - if (bd && (lbd == bd)) + if ((bd) && (lbd == bd)) return 1; } } @@ -272,8 +272,8 @@ E_Border *lbd; E_Shelf *sh; - if (!bd || !tinfo || !tiling_config->tiling_enabled) return; - if (tinfo->desk && (bd->desk != tinfo->desk)) + if ((!bd) || (!tinfo) || (!tiling_config->tiling_enabled)) return; + if ((tinfo->desk) && (bd->desk != tinfo->desk)) { /* We need to verify this because when having multiple zones (xinerama) * it's possible that tinfo is initialized for zone 1 even though @@ -309,7 +309,7 @@ } /* Check if the window is a dialog and whether we should handle it */ - if (!tiling_config->tile_dialogs && + if ((!tiling_config->tile_dialogs) && ((bd->client.icccm.transient_for != 0) || (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG))) return; @@ -320,11 +320,11 @@ return; else if (layout == TILE_BIGMAIN) { - if (remove_bd && (bd == tinfo->mainbd)) + if ((remove_bd) && (bd == tinfo->mainbd)) /* If the main border is getting removed, we need to find another one */ tinfo->mainbd = get_first_window(bd, NULL); - if (!remove_bd && !tinfo->mainbd) + if ((!remove_bd) && (!tinfo->mainbd)) tinfo->mainbd = bd; } @@ -334,11 +334,11 @@ TILE_LOOP_DESKCHECK; if (TILE_LOOP_CHECKS(lbd)) continue; - if (!tiling_config->dont_touch_borders && - tiling_config->tiling_border && - !remove_bd && - ((lbd->bordername && strcmp(lbd->bordername, tiling_config->tiling_border)) || - !lbd->bordername)) + if ((!tiling_config->dont_touch_borders) && + (tiling_config->tiling_border) && + (!remove_bd) && + (((lbd->bordername) && (strcmp(lbd->bordername, tiling_config->tiling_border))) || + (!lbd->bordername))) change_window_border(lbd, tiling_config->tiling_border); if (lbd == bd) continue; if (lbd->visible == 0) continue; @@ -356,10 +356,10 @@ EINA_LIST_FOREACH(e_shelf_list(), l, sh) { - if (!sh || + if ((!sh) || (sh->zone != bd->zone) || - !shelf_show_on_desk(sh, bd->desk) || - sh->cfg->overlap) continue; + (!shelf_show_on_desk(sh, bd->desk)) || + (sh->cfg->overlap)) continue; if (ORIENT_TOP(sh->gadcon->orient)) offset_top += sh->h; @@ -425,14 +425,14 @@ */ EINA_LIST_FOREACH(e_shelf_list(), l, sh) { - if (!sh || + if ((!sh) || (sh->zone != bd->zone) || - !shelf_show_on_desk(sh, bd->desk) || - sh->cfg->overlap) continue; + (!shelf_show_on_desk(sh, bd->desk)) || + (sh->cfg->overlap)) continue; E_Gadcon_Orient orient = sh->gadcon->orient; /* Every row between sh_min and sh_max needs to be flagged */ - if (ORIENT_BOTTOM(orient) || ORIENT_TOP(orient)) + if ((ORIENT_BOTTOM(orient)) || (ORIENT_TOP(orient))) { int sh_min = sh->x, sh_max = sh->x + sh->w; @@ -440,9 +440,9 @@ { int row_min = ((c % gridrows) * wf), row_max = row_min + wf; - if (!shelf_collision_vert[c] && - (between(row_min, sh_min, sh_max) || - between(sh_min, row_min, row_max))) + if ((!shelf_collision_vert[c]) && + ((between(row_min, sh_min, sh_max)) || + (between(sh_min, row_min, row_max)))) { shelf_collision_vert[c] = sh->h; if (sh->h > highest_collision_vert) @@ -452,7 +452,7 @@ } } } - else if (ORIENT_LEFT(orient) || ORIENT_RIGHT(orient)) + else if ((ORIENT_LEFT(orient)) || (ORIENT_RIGHT(orient))) { int sh_min = sh->y, sh_max = sh->y + sh->h; @@ -460,9 +460,9 @@ { int row_min = c * (bd->zone->h / windows_per_row), row_max = row_min + (bd->zone->h / windows_per_row); - if (!shelf_collision_horiz[c] && - (between(row_min, sh_min, sh_max) || - between(sh_min, row_min, row_max))) + if ((!shelf_collision_horiz[c]) && + ((between(row_min, sh_min, sh_max)) || + (between(sh_min, row_min, row_max)))) { shelf_collision_horiz[c] = sh->w; if (sh->w > highest_collision_horiz) @@ -481,11 +481,11 @@ /* Check for too big windows. We're pessimistic for the height-value and use the * one with the lowest available space (due to shelves) */ - if (tiling_config->float_too_big_windows && - check_for_too_big_windows(((bd->zone->w - highest_collision_horiz) / + if ((tiling_config->float_too_big_windows) && + (check_for_too_big_windows(((bd->zone->w - highest_collision_horiz) / max((window_count < (gridrows+1) ? window_count : gridrows), 1)), ((bd->zone->h - highest_collision_vert) / windows_per_row), - bd)) + bd))) return; EINA_LIST_FOREACH(tinfo->client_list, l, lbd) @@ -493,7 +493,7 @@ TILE_LOOP_DESKCHECK; if (TILE_LOOP_CHECKS(lbd)) continue; - if (remove_bd && lbd == bd) continue; + if ((remove_bd) && (lbd == bd)) continue; int row_horiz = (wc % gridrows), row_vert = (wc / gridrows); wf = (shelf_collision_horiz[row_vert] / gridrows); @@ -520,14 +520,14 @@ /* Loop through all the shelves on this screen (=zone) to get their space */ EINA_LIST_FOREACH(e_shelf_list(), l, sh) { - if (!sh || + if ((!sh) || (sh->zone != bd->zone) || - !shelf_show_on_desk(sh, bd->desk) || - sh->cfg->overlap) continue; + (!shelf_show_on_desk(sh, bd->desk)) || + (sh->cfg->overlap)) continue; /* Decide what to do based on the orientation of the shelf */ E_Gadcon_Orient orient = sh->gadcon->orient; - if (ORIENT_BOTTOM(orient) || ORIENT_TOP(orient)) + if ((ORIENT_BOTTOM(orient)) || (ORIENT_TOP(orient))) { if (sh->x <= (bigw * tinfo->big_perc)) bigh -= sh->h; @@ -536,7 +536,7 @@ if (ORIENT_TOP(orient)) offset_top = sh->h; } - if (ORIENT_LEFT(orient) || ORIENT_RIGHT(orient)) + if ((ORIENT_LEFT(orient)) || (ORIENT_RIGHT(orient))) bigw -= sh->w; if (ORIENT_LEFT(orient)) offset_left = sh->w; @@ -547,8 +547,8 @@ smallw -= (bigw + sub_space_x); smallh -= (sub_space_y * (window_count-2)); int hf = (smallh / (window_count-1)); - if (tiling_config->float_too_big_windows && - check_for_too_big_windows(bigw, hf, bd)) + if ((tiling_config->float_too_big_windows) && + (check_for_too_big_windows(bigw, hf, bd))) return; /* Handle Small windows */ @@ -770,20 +770,20 @@ { E_Border *bd = border; - if (!bd || TILE_LOOP_CHECKS(bd) || - (!bd->changes.size && !bd->changes.pos && (eina_list_data_find(tinfo->client_list, bd) == bd))) + if ((!bd) || (TILE_LOOP_CHECKS(bd)) || + ((!bd->changes.size) && (!bd->changes.pos) && (eina_list_data_find(tinfo->client_list, bd) == bd))) return; DBG("cb-Hook for %p / %s / %s, size.changes = %d, position.changes = %d\n", bd, bd->client.icccm.title, bd->client.netwm.name, bd->changes.size, bd->changes.pos); /* If the border changes size, we maybe want to adjust the layout */ - if (tinfo && bd->changes.size) + if ((tinfo) && (bd->changes.size)) { switch (layout_for_desk(bd->desk)) { case TILE_BIGMAIN: /* Only the mainbd-window is resizable */ - if (bd != tinfo->mainbd || tinfo->mainbd_width == -1) break; + if ((bd != tinfo->mainbd) || (tinfo->mainbd_width == -1)) break; /* Don't take the size of a maximized window */ if (bd->maximized) break; /* If the difference is too small, do nothing */ @@ -860,7 +860,7 @@ { Tiling_Info *ti = data; E_Event_Border_Desk_Set *ev = fdata; - if (!ev || !ti) return 1; + if ((!ev) || (!ti)) return 1; if (ti->desk == ev->desk) { ti->need_rearrange = 1; @@ -909,8 +909,8 @@ { Ecore_Event_Mouse_Move *ev = event; - if (!current_zone || !E_INSIDE(ev->root.x, ev->root.y, - current_zone->x, current_zone->y, current_zone->w, current_zone->h)) + if ((!current_zone) || (!E_INSIDE(ev->root.x, ev->root.y, + current_zone->x, current_zone->y, current_zone->w, current_zone->h))) { _desk_before_show(tinfo->desk); E_Desk *desk = get_current_desk(); Index: E-MODULES-EXTRA/tiling/src/e_mod_config.c =================================================================== --- E-MODULES-EXTRA/tiling/src/e_mod_config.c (revision 51690) +++ E-MODULES-EXTRA/tiling/src/e_mod_config.c (working copy) @@ -40,7 +40,7 @@ { struct _E_Config_vdesk *vd = l->data; if (!vd) continue; - if (vd->x == x && vd->y == y && vd->zone_num == zone_num) + if ((vd->x == x) && (vd->y == y) && (vd->zone_num == zone_num)) return vd; } @@ -297,7 +297,7 @@ for (l = e_theme_border_list(); l; l = l->next, c++) { e_widget_ilist_append(ob, NULL, l->data, NULL, NULL, NULL); - if (cfdata->tiling_border && !strcmp(l->data, cfdata->tiling_border)) + if ((cfdata->tiling_border) && (!strcmp(l->data, cfdata->tiling_border))) sel = c; } ILIST_GO(sel); @@ -310,7 +310,7 @@ for (sel = -1, c = 0, l = e_theme_border_list(); l; l = l->next, c++) { e_widget_ilist_append(ob, NULL, l->data, NULL, NULL, NULL); - if (cfdata->floating_border && !strcmp(l->data, cfdata->floating_border)) + if ((cfdata->floating_border) && (!strcmp(l->data, cfdata->floating_border))) sel = c; } ILIST_GO(sel); @@ -331,17 +331,17 @@ if (!need_rearrangement) { - if (cfdata->tiling_border && tiling_config->tiling_border) + if ((cfdata->tiling_border) && (tiling_config->tiling_border)) need_rearrangement = strcmp(cfdata->tiling_border, tiling_config->tiling_border); - else if (cfdata->tiling_border || tiling_config->tiling_border) + else if ((cfdata->tiling_border) || (tiling_config->tiling_border)) need_rearrangement = 1; } if (!need_rearrangement) { - if (cfdata->floating_border && tiling_config->floating_border) + if ((cfdata->floating_border) && (tiling_config->floating_border)) need_rearrangement = strcmp(cfdata->floating_border, tiling_config->floating_border); - else if (cfdata->floating_border || tiling_config->floating_border) + else if ((cfdata->floating_border) || (tiling_config->floating_border)) need_rearrangement = 1; } @@ -353,12 +353,12 @@ { struct _E_Config_vdesk *vd = l->data, *newvd; - if (!vd || !(newvd = get_vdesk(cfdata, vd->x, vd->y, vd->zone_num))) continue; + if ((!vd) || (!(newvd = get_vdesk(cfdata, vd->x, vd->y, vd->zone_num)))) continue; if (newvd->layout != vd->layout) { E_Zone *zone = e_zone_current_get(e_container_current_get(e_manager_current_get())); E_Desk *desk = e_desk_current_get(zone); - if (desk->x == vd->x && desk->y == vd->y && zone->num == vd->zone_num) + if ((desk->x == vd->x) && (desk->y == vd->y) && (zone->num == vd->zone_num)) { need_rearrangement = 1; break; Index: E-MODULES-EXTRA/tiling/src/trivials.c =================================================================== --- E-MODULES-EXTRA/tiling/src/trivials.c (revision 51690) +++ E-MODULES-EXTRA/tiling/src/trivials.c (working copy) @@ -25,7 +25,7 @@ { if (!obj) return; E_Widget_Smart_Data *sd = evas_object_smart_data_get(obj); - if (!sd || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), "e_widget"))) return; + if ((!sd) || ((evas_object_type_get(obj)) && (strcmp(evas_object_type_get(obj), "e_widget")))) return; Eina_List *l; for (l = sd->subobjs; l; l = l->next) @@ -69,7 +69,7 @@ int between(int value, int minimum, int maximum) { - return (value >= minimum && value <= maximum); + return ((value >= minimum) && (value <= maximum)); } /* I wonder why noone has implemented the following one yet? */ @@ -86,7 +86,7 @@ int shelf_show_on_desk(E_Shelf *sh, E_Desk *desk) { - if (!sh || !desk) return 0; + if ((!sh) || (!desk)) return 0; E_Config_Shelf *cf = sh->cfg; if (!cf) return 0; if (!cf->desk_show_mode) return 1; @@ -94,7 +94,7 @@ for (l = cf->desk_list; l; l = l->next) { E_Config_Shelf_Desk *sd = l->data; - if (sd && sd->x == desk->x && sd->y == desk->y) + if ((sd) && (sd->x == desk->x) && (sd->y == desk->y)) return 1; } return 0; Index: E-MODULES-EXTRA/taskbar/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/taskbar/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/taskbar/src/e_mod_main.c (working copy) @@ -471,7 +471,7 @@ { if (border->zone != taskbar->zone) return 1; - if ((border->desk != e_desk_current_get(border->zone)) && !border->sticky) + if ((border->desk != e_desk_current_get(border->zone)) && (!border->sticky)) return 1; } @@ -686,7 +686,7 @@ item = data; if (ev->button == 1) { - if (!item->border->sticky && item->taskbar->config->show_all) + if ((!item->border->sticky) && (item->taskbar->config->show_all)) e_desk_show(item->border->desk); if (evas_key_modifier_is_set(ev->modifiers, "Alt")) { @@ -736,7 +736,7 @@ } else if (ev->button == 2) { - if (!item->border->sticky && item->taskbar->config->show_all) + if ((!item->border->sticky) && (item->taskbar->config->show_all)) e_desk_show(item->border->desk); e_border_raise(item->border); e_border_focus_set(item->border, 1, 1); Index: E-MODULES-EXTRA/penguins/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/penguins/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/penguins/src/e_mod_main.c (working copy) @@ -508,11 +508,11 @@ { tux->x += ((double)tux->custom->h_speed * ecore_animator_frametime_get()); tux->y += ((double)tux->custom->v_speed * ecore_animator_frametime_get()); - if (!_is_inside_any_win(pop, + if ((!_is_inside_any_win(pop, (int)tux->x+(tux->action->w/2), (int)tux->y+tux->action->h+1, - _RET_NONE_VALUE) - && (int)tux->y+tux->action->h+1 < pop->height + _RET_NONE_VALUE)) + && ((int)tux->y+tux->action->h+1 < pop->height) ) { edje_object_signal_callback_del(tux->obj,"custom_done","edje", _cb_custom_end); @@ -573,7 +573,7 @@ //~ printf("FT: %f\n", pop->frame_speed); tux->x -= ((double)tux->action->speed * ecore_animator_frametime_get()); if ((touch = _is_inside_any_win(pop, (int)tux->x , (int)tux->y, _RET_RIGHT_VALUE)) || - tux->x < 0) + (tux->x < 0)) { if (_RAND(CLIMBER_PROB)) _start_climbing_at(tux, touch); @@ -592,7 +592,7 @@ { tux->x += ((double)tux->action->speed * ecore_animator_frametime_get()); if ((touch = _is_inside_any_win(pop, (int)tux->x + tux->action->w, (int)tux->y, _RET_LEFT_VALUE)) || - (tux->x + tux->action->w) > pop->width) + ((tux->x + tux->action->w) > pop->width)) { if (_RAND(CLIMBER_PROB)) { @@ -871,7 +871,7 @@ _start_bombing_at(Penguin *tux, int at_y) { //printf("PENGUINS: Start bombing at %d...\n", at_y); - if (tux->action && ( + if ((tux->action) && ( (tux->action->id == ID_ANGEL) || (tux->action->id == ID_BOMBER) || (tux->action->id == ID_SPLATTER)) Index: E-MODULES-EXTRA/exalt-client/src/network_dialog_new.c =================================================================== --- E-MODULES-EXTRA/exalt-client/src/network_dialog_new.c (revision 51690) +++ E-MODULES-EXTRA/exalt-client/src/network_dialog_new.c (working copy) @@ -184,7 +184,7 @@ return ; string = exalt_dbus_response_iface_get(response); - if(!inst->network_new.iface->iface || !string || !strcmp(inst->network_new.iface->iface,string)==0) + if((!inst->network_new.iface->iface) || (!string) || (!strcmp(inst->network_new.iface->iface,string)==0)) return; switch(exalt_dbus_response_type_get(response)) @@ -294,10 +294,10 @@ e_dialog_button_disable_num_set(inst->network_new.dialog,0,1); e_dialog_button_disable_num_set(inst->network_new.dialog,1,1); - if(exalt_address_is(inst->network_new.ip) - && exalt_address_is(inst->network_new.netmask) - && (!is_pwd || strlen(inst->network_new.pwd)>0) - && strlen(inst->network_new.essid)>0) + if((exalt_address_is(inst->network_new.ip)) + && (exalt_address_is(inst->network_new.netmask)) + && ((!is_pwd) || (strlen(inst->network_new.pwd)>0)) + && (strlen(inst->network_new.essid)>0)) { e_dialog_button_disable_num_set(inst->network_new.dialog,0,0); e_dialog_button_disable_num_set(inst->network_new.dialog,1,0); Index: E-MODULES-EXTRA/exalt-client/src/popup.c =================================================================== --- E-MODULES-EXTRA/exalt-client/src/popup.c (revision 51690) +++ E-MODULES-EXTRA/exalt-client/src/popup.c (working copy) @@ -114,8 +114,8 @@ iface_pos = 0; EINA_LIST_FOREACH(inst->l,l,elt) { - if(elt->type == POPUP_IFACE - && strcmp(elt->iface,iface) == 0) + if((elt->type == POPUP_IFACE) + && (strcmp(elt->iface,iface) == 0)) break; else iface_pos++; @@ -309,13 +309,13 @@ Popup_Elt* elt; Eina_List *l; - if(!inst->popup_ilist_obj || !iface) + if((!inst->popup_ilist_obj) || (!iface)) return; EINA_LIST_FOREACH(inst->l,l,elt) { - if(elt && elt->type == POPUP_IFACE && elt->iface - && strcmp(elt->iface,iface)==0) + if((elt) && (elt->type == POPUP_IFACE) && (elt->iface) + && (strcmp(elt->iface,iface)==0)) { if(elt->iface_type == IFACE_WIRED) { @@ -335,8 +335,8 @@ Eina_List *l; EINA_LIST_FOREACH(inst->l,l,elt) { - if(elt && elt->type == POPUP_IFACE && elt->iface - && strcmp(elt->iface,iface)==0) + if((elt) && (elt->type == POPUP_IFACE) && (elt->iface) + && (strcmp(elt->iface,iface)==0)) { elt->is_up = is_up; break; @@ -351,8 +351,8 @@ Eina_List *l; EINA_LIST_FOREACH(inst->l,l,elt) { - if(elt && elt->type == POPUP_IFACE && elt->iface - && strcmp(elt->iface,iface)==0) + if((elt) && (elt->type == POPUP_IFACE) && (elt->iface) + && (strcmp(elt->iface,iface)==0)) { elt->is_link = is_link; break; @@ -367,9 +367,9 @@ Eina_List *l; EINA_LIST_FOREACH(inst->l,l,elt) { - if(elt && elt->type == POPUP_IFACE && elt->iface - && elt->iface_type == IFACE_WIRELESS - && strcmp(elt->iface,iface)==0) + if((elt) && (elt->type == POPUP_IFACE) && (elt->iface) + && (elt->iface_type == IFACE_WIRELESS) + && (strcmp(elt->iface,iface)==0)) { elt->is_connected = is_connected; break; @@ -385,14 +385,14 @@ Popup_Elt* elt; Eina_List *l; - if(!inst->popup_ilist_obj || !iface) + if((!inst->popup_ilist_obj) || (!iface)) return; EINA_LIST_FOREACH(inst->l,l,elt) { - if(elt && elt->type == POPUP_IFACE && elt->iface - && strcmp(elt->iface,iface)==0) + if((elt) && (elt->type == POPUP_IFACE) && (elt->iface) + && (strcmp(elt->iface,iface)==0)) { popup_iface_label_create(elt,buf,1024,essid); e_widget_ilist_nth_label_set(inst->popup_ilist_obj,i,buf); @@ -410,14 +410,14 @@ Eina_List *l; EINA_LIST_FOREACH(inst->l,l,elt) { - if(elt && elt->type == POPUP_IFACE && elt->iface - && strcmp(elt->iface,iface)==0) + if((elt) && (elt->type == POPUP_IFACE) && (elt->iface) + && (strcmp(elt->iface,iface)==0)) { if(!elt->is_link) edje_object_signal_emit(elt->icon,"notLink","exalt"); else if(!elt->is_up) edje_object_signal_emit(elt->icon,"notActivate","exalt"); - else if(!elt->is_connected && elt->iface_type == IFACE_WIRELESS) + else if((!elt->is_connected) && (elt->iface_type == IFACE_WIRELESS)) edje_object_signal_emit(elt->icon,"notConnected","exalt"); else edje_object_signal_emit(elt->icon,"default","exalt"); @@ -458,8 +458,8 @@ Popup_Elt *elt; iface = exalt_dbus_response_iface_get(response); EINA_LIST_FOREACH(inst->l,l,elt) - if( elt->type==POPUP_IFACE - && strcmp(elt->iface,iface)==0) + if( (elt->type==POPUP_IFACE) + && (strcmp(elt->iface,iface)==0)) break; if(elt) @@ -520,8 +520,8 @@ Eina_List *l; EINA_LIST_FOREACH(inst->l,l,elt) { - if(elt && elt->type == POPUP_IFACE && elt->iface - && strcmp(elt->iface,iface)==0) + if((elt) && (elt->type == POPUP_IFACE) && (elt->iface) + && (strcmp(elt->iface,iface)==0)) { *id_first = i; *first = l; @@ -536,7 +536,7 @@ EINA_LIST_FOREACH(eina_list_next(l),l,elt) { - if(elt && elt->type == POPUP_IFACE) + if((elt) && (elt->type == POPUP_IFACE)) { break; } @@ -575,7 +575,7 @@ { elt = eina_list_data_get(l); elt->is_find--; - }while(l!=last && (l = eina_list_next(l)) ); + }while((l!=last) && (l = eina_list_next(l)) ); EINA_LIST_FOREACH(networks,l,w) { @@ -591,13 +591,13 @@ { Popup_Elt* elt; elt = eina_list_data_get(l2); - if(elt && elt->essid && essid && strcmp(elt->essid,essid)==0) + if((elt) && (elt->essid) && (essid) && (strcmp(elt->essid,essid)==0)) { find = i; elt_find = elt; } i++; - }while(l2!=last && !elt_find && (l2 = eina_list_next(l2)) ); + }while((l2!=last) && (!elt_find) && (l2 = eina_list_next(l2)) ); if(!elt_find) { @@ -671,7 +671,7 @@ Popup_Elt* elt; elt = eina_list_data_get(l); - if(elt && elt->type == POPUP_NETWORK && !elt->is_find) + if((elt) && (elt->type == POPUP_NETWORK) && (!elt->is_find)) { e_widget_ilist_remove_num(inst->popup_ilist_obj,i+id_first); l = l_prev; @@ -683,7 +683,7 @@ else i++; l_prev = l; - }while(l!=last && (l = eina_list_next(l)) ); + }while((l!=last) && (l = eina_list_next(l)) ); /*Eina_List* l2; EINA_LIST_FOREACH(inst->l,l2,elt) Index: E-MODULES-EXTRA/exalt-client/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/exalt-client/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/exalt-client/src/e_mod_main.c (working copy) @@ -583,7 +583,7 @@ } } - if(send_notif && exalt_conf->notification) + if((send_notif) && (exalt_conf->notification)) { notify = notification_new(); } @@ -667,7 +667,7 @@ case EXALT_DBUS_RESPONSE_IFACE_DOWN: break; case EXALT_DBUS_RESPONSE_WIRELESS_ESSID_GET: - if(send_notif && exalt_conf->notification) + if((send_notif) && (exalt_conf->notification)) { snprintf(buf,1024,"Connected to %s\n", exalt_dbus_response_string_get(response)); @@ -701,7 +701,7 @@ default: ; } - if(send_notif && exalt_conf->notification) + if((send_notif) && (exalt_conf->notification)) { e_notification_send(notify,NULL,NULL); e_notification_unref(notify); Index: E-MODULES-EXTRA/exalt-client/src/network_dialog.c =================================================================== --- E-MODULES-EXTRA/exalt-client/src/network_dialog.c (revision 51690) +++ E-MODULES-EXTRA/exalt-client/src/network_dialog.c (working copy) @@ -410,8 +410,8 @@ if(exalt_dbus_response_type_get(response)!=EXALT_DBUS_RESPONSE_NETWORK_CONFIGURATION_GET) { string = exalt_dbus_response_iface_get(response); - if( !inst->network.network->iface || !string - || !strcmp(inst->network.network->iface,string)==0) + if( (!inst->network.network->iface) || (!string) + || (!strcmp(inst->network.network->iface,string)==0)) return; } @@ -496,19 +496,19 @@ if(exalt_conf_network_wpa_type_get(cn) == exalt_wireless_network_ie_wpa_type_get(ie)) step1=1; - for(i=0;!found && inetwork_basic.network->iface || !string - || !strcmp(inst->network_basic.network->iface,string)==0) + if( (!inst->network_basic.network->iface) || (!string) + || (!strcmp(inst->network_basic.network->iface,string)==0)) return; } @@ -311,11 +311,11 @@ } const char *essid = exalt_wireless_network_essid_get(inst->network_basic.network->n); - if(inst->network_basic.network->is_up - && inst->network_basic.network->is_link - && inst->network_basic.network->is_connected - && inst->network_basic.current_essid && essid - && strcmp(inst->network_basic.current_essid, essid) == 0) + if((inst->network_basic.network->is_up) + && (inst->network_basic.network->is_link) + && (inst->network_basic.network->is_connected) + && (inst->network_basic.current_essid) && (essid) + && (strcmp(inst->network_basic.current_essid, essid) == 0)) e_widget_button_label_set(inst->network_basic.btn, D_("Disconnect the interface")); else { @@ -514,11 +514,11 @@ Instance *inst = data; const char *essid = exalt_wireless_network_essid_get(inst->network_basic.network->n); - if(inst->network_basic.network->is_up - && inst->network_basic.network->is_link - && inst->network_basic.network->is_connected - && inst->network_basic.current_essid && essid - && strcmp(inst->network_basic.current_essid, essid) == 0) + if((inst->network_basic.network->is_up) + && (inst->network_basic.network->is_link) + && (inst->network_basic.network->is_connected) + && (inst->network_basic.current_essid) && (essid) + && (strcmp(inst->network_basic.current_essid, essid) == 0)) { if_network_dialog_basic_cb_disconnect(inst,NULL); Index: E-MODULES-EXTRA/exalt-client/src/wired_dialog.c =================================================================== --- E-MODULES-EXTRA/exalt-client/src/wired_dialog.c (revision 51690) +++ E-MODULES-EXTRA/exalt-client/src/wired_dialog.c (working copy) @@ -154,7 +154,7 @@ return ; string = exalt_dbus_response_iface_get(response); - if(!inst->wired.iface->iface || !string || !strcmp(inst->wired.iface->iface,string)==0) + if((!inst->wired.iface->iface) || (!string) || (!strcmp(inst->wired.iface->iface,string)==0)) return; switch(exalt_dbus_response_type_get(response)) Index: E-MODULES-EXTRA/exalt-client/src/wired_dialog_basic.c =================================================================== --- E-MODULES-EXTRA/exalt-client/src/wired_dialog_basic.c (revision 51690) +++ E-MODULES-EXTRA/exalt-client/src/wired_dialog_basic.c (working copy) @@ -100,7 +100,7 @@ return ; string = exalt_dbus_response_iface_get(response); - if(!inst->wired_basic.iface->iface || !string || !strcmp(inst->wired_basic.iface->iface,string)==0) + if((!inst->wired_basic.iface->iface) || (!string) || (!strcmp(inst->wired_basic.iface->iface,string)==0)) return; switch(exalt_dbus_response_type_get(response)) Index: E-MODULES-EXTRA/exalt-client/src/wireless_dialog.c =================================================================== --- E-MODULES-EXTRA/exalt-client/src/wireless_dialog.c (revision 51690) +++ E-MODULES-EXTRA/exalt-client/src/wireless_dialog.c (working copy) @@ -105,7 +105,7 @@ return ; string = exalt_dbus_response_iface_get(response); - if(!inst->wireless.iface->iface || !string || !strcmp(inst->wireless.iface->iface,string)==0) + if((!inst->wireless.iface->iface) || (!string) || (!strcmp(inst->wireless.iface->iface,string)==0)) return; switch(exalt_dbus_response_type_get(response)) Index: E-MODULES-EXTRA/winlist-ng/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/winlist-ng/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/winlist-ng/src/e_mod_main.c (working copy) @@ -160,7 +160,7 @@ (ngw_config->handlers, ecore_event_handler_add (E_EVENT_CONTAINER_RESIZE, _ngw_win_container_resize_cb, NULL)); - if(ecore_x_screen_is_composited(0) || e_config->use_composite) + if((ecore_x_screen_is_composited(0)) || (e_config->use_composite)) { ngw_config->use_composite = 1; printf("found composite manager\n"); Index: E-MODULES-EXTRA/winlist-ng/src/e_mod_keybindings.c =================================================================== --- E-MODULES-EXTRA/winlist-ng/src/e_mod_keybindings.c (revision 51690) +++ E-MODULES-EXTRA/winlist-ng/src/e_mod_keybindings.c (working copy) @@ -124,8 +124,8 @@ { eb = (E_Config_Binding_Key*) l->data; - if (eb && eb->action && eb->action && - !strcmp(!eb->action ? "" : eb->action, !key->action ? "" : key->action)) + if ((eb) && (eb->action) && (eb->action) && + (!strcmp(!eb->action ? "" : eb->action, !key->action ? "" : key->action))) { if (save) { @@ -174,17 +174,17 @@ Eina_List *l; E_Config_Binding_Key *eb; - if (!key || !key->key || !key->key[0] || !action) return; + if ((!key) || (!key->key) || (!key->key[0]) || (!action)) return; CFG_KEYBIND(key->context, key->key, key->modifiers, key->any_mod, action, key->params); - for (l = e_config->key_bindings, found = 0; l && !found; l = l->next) + for (l = e_config->key_bindings, found = 0; (l) && (!found); l = l->next) { E_Config_Binding_Key *t = (E_Config_Binding_Key*) l->data; - if (!strcmp(!t->action ? "" : t->action, eb->action) && - !strcmp(!t->params ? "" : t->params, !eb->params ? "" : eb->params)) + if ((!strcmp(!t->action ? "" : t->action, eb->action)) && + (!strcmp(!t->params ? "" : t->params, !eb->params ? "" : eb->params))) found = 1; } Index: E-MODULES-EXTRA/winlist-ng/src/ng_box.c =================================================================== --- E-MODULES-EXTRA/winlist-ng/src/ng_box.c (revision 51690) +++ E-MODULES-EXTRA/winlist-ng/src/ng_box.c (working copy) @@ -139,7 +139,7 @@ sqrt_ffxx = sqrt(ff - x * x); sqrt_ff_1 = sqrt(ff - 1.0); - if (d > -range && d < range) + if ((d > -range) && (d < range)) { *zoom = (box->zoom - 1.0) * (cfg->zoomfactor - 1.0) * ((sqrt_ff_1 - sqrt_ffxx) / (sqrt_ff_1 - f)) + 1.0; Index: E-MODULES-EXTRA/winlist-ng/src/ng_winlist.c =================================================================== --- E-MODULES-EXTRA/winlist-ng/src/ng_winlist.c (revision 51690) +++ E-MODULES-EXTRA/winlist-ng/src/ng_winlist.c (working copy) @@ -139,7 +139,7 @@ _ngw_winlist_create_list(1); - if(!items_cnt && keep_toggles) //TODO config + if((!items_cnt) && (keep_toggles)) //TODO config { show_all = 1; show_iconified = 1; @@ -280,7 +280,7 @@ ngw_win_hide(winlist->win); // FIXME ??? } - else if(ngw_config->use_composite && ngw_config->winlist_cfg->hide_animation) + else if((ngw_config->use_composite) && (ngw_config->winlist_cfg->hide_animation)) { fade_out_time = ecore_time_get(); fade_out_timer = ecore_timer_add(0.02, _ngw_winlist_fade_out_timer, NULL); @@ -432,7 +432,7 @@ static void _ngw_winlist_show_iconified_toggle(void) { - if(show_iconified && !show_all) return; + if((show_iconified) && (!show_all)) return; show_iconified = 1; //show_iconified ? 0 : 1; @@ -456,7 +456,7 @@ static void _ngw_winlist_show_selected_type(void) { - if(show_type || !win_selected) + if((show_type) || (!win_selected)) { return; } @@ -501,7 +501,7 @@ { E_Desk *desk; - CHECK_0 (deleted_border && bd == deleted_border); + CHECK_0 ((deleted_border) && (bd == deleted_border)); CHECK_0 ((!bd->client.icccm.accepts_focus) && (!bd->client.icccm.take_focus)); @@ -514,13 +514,13 @@ if(show_type) { - CHECK(bd->client.icccm.class && - !strcmp(bd->client.icccm.class, show_type->client.icccm.class)); + CHECK((bd->client.icccm.class) && + (!strcmp(bd->client.icccm.class, show_type->client.icccm.class))); } - CHECK_0(!show_iconified && bd->iconic); + CHECK_0((!show_iconified) && (bd->iconic)); - if(show_iconified && !show_all) + if((show_iconified) && (!show_all)) { CHECK(bd->iconic); } @@ -531,7 +531,7 @@ { CHECK(bd->desk != desk); } - else if(bd->desk != desk && !bd->sticky) + else if((bd->desk != desk) && (!bd->sticky)) { CHECK(show_all_desk == 2); } @@ -554,7 +554,7 @@ { borders = eina_list_append(borders, bd); - if(cnt++ > 10 && initial) // TODO config option + if((cnt++ > 10) && (initial)) // TODO config option { return borders; } @@ -576,7 +576,7 @@ items_cnt = eina_list_count(borders); - for(l = eina_list_last(borders); l && cnt < (items_cnt / 2 - (initial ? 1 : 0)); l = l->prev, cnt++) + for(l = eina_list_last(borders); (l) && (cnt < (items_cnt / 2 - (initial ? 1 : 0))); l = l->prev, cnt++) { bd = (E_Border*)l->data; it = ngw_item_new(winlist, bd); @@ -585,7 +585,7 @@ bd_last = bd; } - for(l = borders; l && cnt < items_cnt; l = l->next, cnt++) + for(l = borders; (l) && (cnt < items_cnt); l = l->next, cnt++) { bd = (E_Border*)l->data; it = ngw_item_new(winlist, bd); @@ -675,7 +675,7 @@ return EINA_FALSE; } - if(fade_out_timer && ecore_time_get() - fade_out_time > 0.08) + if((fade_out_timer) && (ecore_time_get() - fade_out_time > 0.08)) { ecore_timer_del(fade_out_timer); fade_out_timer = ecore_timer_add(0.001, _ngw_winlist_fade_out_timer, NULL); @@ -772,7 +772,7 @@ it->was_iconified = 1; ok = 1; } - else if((bd->desk == e_desk_current_get(winlist->zone)) || bd->sticky) + else if((bd->desk == e_desk_current_get(winlist->zone)) || (bd->sticky)) { ok = 1; } @@ -782,8 +782,8 @@ ok = 1; } - if((bd->shaded || (bd->changes.shaded && (bd->shade.val != bd->shaded) && bd->shade.val)) && - bd->desk == e_desk_current_get(winlist->zone)) + if(((bd->shaded) || (bd->changes.shaded && (bd->shade.val != bd->shaded) && (bd->shade.val))) && + (bd->desk == e_desk_current_get(winlist->zone))) { e_border_unshade(it->border, it->border->shade.dir); it->was_shaded = 1; @@ -866,7 +866,7 @@ if(it->bd_above) /* FIXME stack above issues*/ e_border_stack_below(it->border, it->bd_above); - if(it->desk && it->desk != e_desk_current_get(winlist->zone)) + if((it->desk) && (it->desk != e_desk_current_get(winlist->zone))) { e_border_desk_set(it->border, it->desk); it->desk = NULL; @@ -1006,9 +1006,9 @@ { bind = l->data; - if (bind->action && - strcmp(bind->action, "ngw_winlist_prev") && - strcmp(bind->action, "ngw_winlist_next")) continue; + if ((bind->action) && + (strcmp(bind->action, "ngw_winlist_prev")) && + (strcmp(bind->action, "ngw_winlist_next"))) continue; mod = 0; @@ -1017,7 +1017,7 @@ if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT; if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN; - if (bind->key && (!strcmp(bind->key, ev->keyname)) && ((bind->modifiers == mod))) + if ((bind->key) && (!strcmp(bind->key, ev->keyname)) && ((bind->modifiers == mod))) { act = e_action_find(bind->action); Index: E-MODULES-EXTRA/everything-pidgin/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/everything-pidgin/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/everything-pidgin/src/e_mod_main.c (working copy) @@ -192,7 +192,7 @@ DBusMessageIter itr, arr; Buddy_Info *bi; - if (!active || !check_msg(data, reply, error)) return; + if ((!active) || (!check_msg(data, reply, error))) return; dbus_message_iter_init(reply, &itr); dbus_message_iter_recurse(&itr, &arr); @@ -223,7 +223,7 @@ static void cb_buddyAccount(void *data, DBusMessage *reply, DBusError *error) { - if (!active || !check_msg(data, reply, error)) return; + if ((!active) || (!check_msg(data, reply, error))) return; GET_BUDDYINFO(bi, data); @@ -238,7 +238,7 @@ { const char* tmpString = NULL; - if (!active || !check_msg(data, reply, error)) return; + if ((!active) || (!check_msg(data, reply, error))) return; GET_BUDDYINFO(bi, data); @@ -256,7 +256,7 @@ { const char* tmpString = NULL; - if (!active || !check_msg(data, reply, error)) return; + if ((!active) || (!check_msg(data, reply, error))) return; GET_BUDDYINFO(bi, data); @@ -272,7 +272,7 @@ static void cb_buddyIconReference(void *data, DBusMessage *reply, DBusError *error) { - if (!active || !check_msg(data, reply, error)) return; + if ((!active) || (!check_msg(data, reply, error))) return; GET_BUDDYINFO(bi, data); @@ -292,7 +292,7 @@ { const char* tmpString = NULL; - if (!active || !check_msg(data, reply, error)) return; + if ((!active) || (!check_msg(data, reply, error))) return; GET_BUDDYINFO(bi, data); @@ -311,8 +311,8 @@ _item_add(Buddy_Info *bi) { if ((!EVRY_ITEM(bi)->label || - EVRY_ITEM(bi)->label[0] == '\0') || - (!bi->networkID || bi->networkID[0] == '\0') || + (EVRY_ITEM(bi)->label[0] == '\0')) || + (!bi->networkID || (bi->networkID[0] == '\0')) || (bi->accountNr == 0)) return; Index: E-MODULES-EXTRA/alarm/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/alarm/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/alarm/src/e_mod_main.c (working copy) @@ -334,8 +334,8 @@ if (alarm_config->alarms_details) alarm_edje_refresh_details(); - if ( !eina_list_count(alarm_config->alarms) && - alarm_config->alarms_ring_etimer ) + if ( (!eina_list_count(alarm_config->alarms)) && + (alarm_config->alarms_ring_etimer) ) { ecore_timer_del(alarm_config->alarms_ring_etimer); alarm_config->alarms_ring_etimer = NULL; @@ -605,13 +605,13 @@ break; case ALARM_SCHED_WEEK: - if ((al->sched.day_monday || - al->sched.day_tuesday || - al->sched.day_wenesday || - al->sched.day_thursday || - al->sched.day_friday || - al->sched.day_saturday || - al->sched.day_sunday) == 0) + if (((al->sched.day_monday) || + (al->sched.day_tuesday) || + (al->sched.day_wenesday) || + (al->sched.day_thursday) || + (al->sched.day_friday) || + (al->sched.day_saturday) || + (al->sched.day_sunday)) == 0) return 0; if (al->sched.date_epoch <= ecore_time_get()) @@ -761,8 +761,8 @@ day_week[4] = day_thursday; day_week[5] = day_friday; day_week[6] = day_saturday; - if (!(day_week[0] || day_week[1] || day_week[2] || day_week[3] || - day_week[4] || day_week[5] || day_week[6])) + if (!((day_week[0]) || (day_week[1]) || (day_week[2]) || (day_week[3]) || + (day_week[4]) || (day_week[5]) || (day_week[6]))) return 0; t = time(NULL); ts_today = localtime(&t); Index: E-MODULES-EXTRA/empris/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/empris/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/empris/src/e_mod_main.c (working copy) @@ -598,7 +598,7 @@ static int _dbus_check_msg(DBusMessage *reply, DBusError *error) { - if (error && dbus_error_is_set(error)) + if ((error) && (dbus_error_is_set(error))) { printf("Error: %s - %s\n", error->name, error->message); return 0; @@ -752,7 +752,7 @@ { dbus_message_iter_recurse (&iter, &iter_val); dbus_message_iter_get_basic (&iter_val, &tmp); - if (tmp && tmp[0]) + if ((tmp) && (tmp[0])) { edje_object_part_text_set (empris, "empris.artist", tmp); edje_object_part_text_set (o_popup, "empris.artist", tmp); @@ -762,7 +762,7 @@ { dbus_message_iter_recurse (&iter, &iter_val); dbus_message_iter_get_basic (&iter_val, &tmp); - if (tmp && tmp[0]) + if ((tmp) && (tmp[0])) { edje_object_part_text_set (empris, "empris.title", tmp); edje_object_part_text_set (o_popup, "empris.title", tmp); @@ -773,7 +773,7 @@ { dbus_message_iter_recurse (&iter, &iter_val); dbus_message_iter_get_basic (&iter_val, &tmp); - if (tmp && tmp[0]) + if ((tmp) && (tmp[0])) { location = strdup(tmp); } @@ -782,7 +782,7 @@ { dbus_message_iter_recurse (&iter, &iter_val); dbus_message_iter_get_basic (&iter_val, &tmp); - if (tmp && tmp[0]) + if ((tmp) && (tmp[0])) { edje_object_part_text_set (empris, "empris.album", tmp); edje_object_part_text_set (o_popup, "empris.album", tmp); @@ -797,7 +797,7 @@ } } - if (!title && location) + if ((!title) && (location)) { char *tmp = _util_unescape(ecore_file_file_get(location), 0); @@ -1018,7 +1018,7 @@ while(--alloc > 0) { in = *string; - if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) { + if(('%' == in) && (ISXDIGIT(string[1])) && (ISXDIGIT(string[2]))) { /* this is two hexadecimal digits following a '%' */ char hexstr[3]; char *ptr; Index: E-MODULES-EXTRA/uptime/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/uptime/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/uptime/src/e_mod_main.c (working copy) @@ -468,8 +468,8 @@ mib[1] = KERN_BOOTTIME; size = sizeof (boottime); - if (sysctl (mib, 2, &boottime, &size, NULL, 0) != -1 && - boottime.tv_sec != 0) + if ((sysctl (mib, 2, &boottime, &size, NULL, 0) != -1) && + (boottime.tv_sec != 0)) { uptime = now - boottime.tv_sec; if (uptime > 60) Index: E-MODULES-EXTRA/efm_pathbar/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/efm_pathbar/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/efm_pathbar/src/e_mod_main.c (working copy) @@ -200,7 +200,7 @@ inst = data; ev = event_info; - if ((ev->button != 3) || inst->gcc->menu) return; + if ((ev->button != 3) || (inst->gcc->menu)) return; zone = e_util_zone_current_get(e_manager_current_get()); mn = e_menu_new(); e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0); @@ -215,7 +215,7 @@ Instance *inst = data; Evas_Object *o_fm; - if (!inst || !inst->tbar) return; + if ((!inst) || (!inst->tbar)) return; o_fm = e_toolbar_fm2_get(inst->tbar); if (!o_fm) return; @@ -230,7 +230,7 @@ Evas_Object *o_fm, *btn; char path[PATH_MAX] = "/"; - if (!inst || !inst->tbar) return; + if ((!inst) || (!inst->tbar)) return; o_fm = e_toolbar_fm2_get(inst->tbar); if (!o_fm) return; @@ -259,7 +259,7 @@ Evas_Object *o; Evas_Coord mw = 0, mh = 0; - if (!inst || !label || !*label || !func) + if ((!inst) || (!label) || (!*label) || (!func)) return NULL; o = edje_object_add(evas_object_evas_get(inst->o_box)); @@ -316,7 +316,7 @@ Eina_List *l; // safety checks - if (!inst || !inst->tbar) return; + if ((!inst) || (!inst->tbar)) return; o_fm = e_toolbar_fm2_get(inst->tbar); if (!o_fm) return; realpath = e_fm2_real_path_get(o_fm); Index: E-MODULES-EXTRA/everything-wallpaper/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/everything-wallpaper/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/everything-wallpaper/src/e_mod_main.c (working copy) @@ -67,7 +67,7 @@ { GET_FILE(file, it); - if (file->mime && (!strncmp(file->mime, "image/", 6))) + if ((file->mime) && (!strncmp(file->mime, "image/", 6))) return 1; return 0; Index: E-MODULES-EXTRA/everything-wallpaper/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/everything-wallpaper/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/everything-wallpaper/e_mod_main.c (working copy) @@ -295,7 +295,7 @@ return; dbus_message_iter_get_basic(iter, &mime); - if (path && name && mime) + if ((path) && (name) && (mime)) file = _file_item_get(p, urn, path, name, mime, 0); if (file) @@ -311,7 +311,7 @@ char *label, *path, *detail; Eina_List *l; - if (!it || strcmp(urn, EVRY_ITEM(it)->id)) + if ((!it) || (strcmp(urn, EVRY_ITEM(it)->id))) { label = evry_util_unescape(urn + 10, 0); @@ -326,7 +326,7 @@ it = _query_item_get(p, urn, label, detail, query_tracks_for_album, urn); - if (it && (!EVRY_ITEM(it)->data)) + if ((it) && (!EVRY_ITEM(it)->data)) *items = eina_list_append(*items, it); } else @@ -358,7 +358,7 @@ char *label, *path; Eina_List *l; - if (!it || strcmp(urn, EVRY_ITEM(it)->id)) + if ((!it) || (strcmp(urn, EVRY_ITEM(it)->id))) { label = evry_util_unescape(urn + 11, 0); @@ -483,7 +483,7 @@ return NULL; } - if (match && match2) + if ((match) && (match2)) { _query = malloc(sizeof(char) * (strlen(match) + strlen(match2) + strlen(query))); sprintf(_query, query, match, match2); @@ -527,8 +527,8 @@ p->base = *plugin; p->base.items = NULL; - if (item && evry_item_type_check(item, "TRACKER_QUERY", NULL) || - item && evry_item_type_check(item, "TRACKER_MUSIC", NULL)) + if (((item) && (evry_item_type_check(item, "TRACKER_QUERY", NULL))) || + ((item) && (evry_item_type_check(item, "TRACKER_MUSIC", NULL)))) { QUERY_ITEM(it, item); p->parent = EINA_TRUE; @@ -536,7 +536,7 @@ if (it->match) p->match = eina_stringshare_add(it->match); } - else if (item && evry_item_type_check(item, "FILE", NULL)) + else if ((item) && (evry_item_type_check(item, "FILE", NULL))) { GET_FILE(it, item); p->parent = EINA_TRUE; @@ -591,7 +591,7 @@ GET_PLUGIN(p, plugin); - if (p->filter_result && p->files) + if ((p->filter_result) && (p->files)) { Evry_Item *it; Eina_List *l; @@ -599,17 +599,17 @@ EVRY_PLUGIN_ITEMS_CLEAR(p); EINA_LIST_FOREACH(p->files, l, it) - if (!input || evry_fuzzy_match(it->label, input)) + if ((!input) || (evry_fuzzy_match(it->label, input))) EVRY_PLUGIN_ITEM_APPEND(p, it); - if (p->parent && p->base.items) return 1; + if ((p->parent) && (p->base.items)) return 1; } if (p->pnd) dbus_pending_call_cancel(p->pnd); p->pnd = NULL; - if (input && (strlen(input) > 2) && isalnum(input[0])) + if ((input) && (strlen(input) > 2) && (isalnum(input[0]))) { if (p->input) eina_stringshare_del(p->input); p->input = eina_stringshare_add(input); @@ -726,11 +726,11 @@ { if (evry_item_type_check(item, "TRACKER_MUSIC", NULL)) { - if (item->subtype && item->subtype == _file_list) + if ((item->subtype) && (item->subtype == _file_list)) { QUERY_ITEM(it, item); - if (!item->label || !item->detail) + if ((!item->label) || (!item->detail)) return evry_icon_theme_get("folder", e); char *suma, *sumb, *a; @@ -920,7 +920,7 @@ if (_file_list) eina_stringshare_del(_file_list); - if (_active && e_datastore_get("everything_loaded")) + if ((_active) && (e_datastore_get("everything_loaded"))) _plugins_shutdown(); module = NULL; Index: E-MODULES-EXTRA/execwatch/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/execwatch/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/execwatch/src/e_mod_main.c (working copy) @@ -105,8 +105,8 @@ if (inst->ci->display_name) edje_object_part_text_set(execwatch->execwatch_obj, "e.text.display_name", inst->ci->display_name); - if (inst->ci->status_cmd && strlen(inst->ci->status_cmd) && - (inst->ci->poll_time_hours || inst->ci->poll_time_mins || inst->ci->poll_time_secs)) + if ((inst->ci->status_cmd) && (strlen(inst->ci->status_cmd)) && + ((inst->ci->poll_time_hours) || (inst->ci->poll_time_mins) || (inst->ci->poll_time_secs))) { inst->poll_timer = ecore_timer_add((inst->ci->poll_time_hours + inst->ci->poll_time_mins + inst->ci->poll_time_secs), _execwatch_status_cmd_exec, inst); @@ -246,7 +246,7 @@ edje_object_file_set(execwatch->icon_obj, m, buf); edje_object_part_swallow(execwatch->execwatch_obj, "icon", execwatch->icon_obj); - if (inst->ci->icon_path && ecore_file_exists(inst->ci->icon_path)) + if ((inst->ci->icon_path) && (ecore_file_exists(inst->ci->icon_path))) { e_icon_file_set(execwatch->icon_custom_obj, inst->ci->icon_path); edje_object_part_swallow(execwatch->execwatch_obj, "custom_icon", execwatch->icon_custom_obj); @@ -269,7 +269,7 @@ execwatch = inst->execwatch; if (!execwatch) return EINA_TRUE; if (inst->status_exe) return EINA_TRUE; - if (!inst->ci->status_cmd || !strlen(inst->ci->status_cmd)) return EINA_TRUE; + if ((!inst->ci->status_cmd) || (!strlen(inst->ci->status_cmd))) return EINA_TRUE; _execwatch_icon(inst, "cmd_exec"); inst->status_exe = ecore_exe_pipe_run(inst->ci->status_cmd, @@ -311,7 +311,7 @@ } else { - if (inst->read && inst->read->lines) + if ((inst->read) && (inst->read->lines)) { int icon_set = 0; @@ -346,7 +346,7 @@ old_popup_pinned_state = inst->popup->pinned; } _execwatch_popup_content_create(inst); - if (inst->popup && old_popup_state) + if ((inst->popup) && (old_popup_state)) { e_gadcon_popup_show(inst->popup); if (old_popup_pinned_state) e_gadcon_popup_toggle_pinned(inst->popup); @@ -374,9 +374,9 @@ char *text; int i=0, textlen=0; - if (!inst->ci->status_cmd || !strlen(inst->ci->status_cmd)) return; + if ((!inst->ci->status_cmd) || (!strlen(inst->ci->status_cmd))) return; - if (inst->read && inst->read->lines) + if ((inst->read) && (inst->read->lines)) { lines = inst->read->lines; for (i = 0; lines[i].line; i++) @@ -468,9 +468,9 @@ if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) { - if (!inst->dblclk_exe && - inst->ci->dblclk_cmd && - strlen(inst->ci->dblclk_cmd)) + if ((!inst->dblclk_exe) && + (inst->ci->dblclk_cmd) && + (strlen(inst->ci->dblclk_cmd))) { inst->dblclk_exe = ecore_exe_run(inst->ci->dblclk_cmd, inst); ecore_exe_tag_set(inst->dblclk_exe, DBLCLK_EXE_TAG); Index: E-MODULES-EXTRA/execwatch/src/e_mod_config.c =================================================================== --- E-MODULES-EXTRA/execwatch/src/e_mod_config.c (revision 51690) +++ E-MODULES-EXTRA/execwatch/src/e_mod_config.c (working copy) @@ -200,9 +200,9 @@ case 1: if (!strlen(cfdata->okstate_string)) return 0; break; case 2: if (!strlen(cfdata->okstate_lines)) return 0; break; } - if (!cfdata->poll_time_hours && - !cfdata->poll_time_mins && - !cfdata->poll_time_secs) return 0; + if ((!cfdata->poll_time_hours) && + (!cfdata->poll_time_mins) && + (!cfdata->poll_time_secs)) return 0; if (ci->display_name) eina_stringshare_del(ci->display_name); ci->display_name = eina_stringshare_add(cfdata->display_name); Index: E-MODULES-EXTRA/news/src/news_menu.c =================================================================== --- E-MODULES-EXTRA/news/src/news_menu.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_menu.c (working copy) @@ -54,7 +54,7 @@ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, D_("Configure this feed")); - if (f->icon && f->icon[0]) + if ((f->icon) && (f->icon[0])) e_menu_item_icon_file_set(mi, f->icon); e_menu_item_callback_set(mi, _cb_configure_feed, f); Index: E-MODULES-EXTRA/news/src/news_parse.c =================================================================== --- E-MODULES-EXTRA/news/src/news_parse.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_parse.c (working copy) @@ -116,7 +116,7 @@ if (!_parse_type(doc)) { - if (doc->articles && eina_list_count(doc->articles)) + if ((doc->articles) && (eina_list_count(doc->articles))) cb_func(doc, NEWS_PARSE_ERROR_TYPE_UNKNOWN, 0); else cb_func(doc, NEWS_PARSE_ERROR_TYPE_UNKNOWN, 1); @@ -362,7 +362,7 @@ feed->important, feed->category, 0); - if (feed->item && feed->item->viewer) + if ((feed->item) && (feed->item->viewer)) news_viewer_refresh(feed->item->viewer); news_feed_lists_refresh(1); } @@ -418,8 +418,8 @@ art = parser->art; - if (!parser->doc->articles || - !eina_list_count(parser->doc->articles)) + if ((!parser->doc->articles) || + (!eina_list_count(parser->doc->articles))) return NEWS_PARSE_ERROR_NO; DPARSE(("ALREADY EXISTS : Go %s %s", @@ -433,9 +433,9 @@ && ( !news_util_datecmp(&art->date, &a->date) ) && - ( ( (art->title && a->title) && - !strcmp(art->title, a->title) ) || - (!art->title && !a->title) ) + ( ( (art->title && (a->title)) && + (!strcmp(art->title, a->title)) ) || + ((!art->title) && (!a->title)) ) ) { art->article = a; @@ -477,10 +477,10 @@ pos = parser->buffer_pos; p1 = strstr(pos, "pos_end)) + if ((p1) && (p1 < art->pos_end)) { p2 = _meta_block_find(&p1); - if (!p2 || (p2 > art->pos_end)) + if ((!p2) || (p2 > art->pos_end)) return NEWS_PARSE_ERROR_BROKEN_FEED; len = p2 - p1; art->title = E_NEW(char, len+1); @@ -506,10 +506,10 @@ pos = parser->buffer_pos; p1 = strstr(pos, parser->doc->parse.meta_date); - if (p1 && (p1 < art->pos_end)) + if ((p1) && (p1 < art->pos_end)) { p2 = _meta_block_find(&p1); - if (!p2 || p2 > art->pos_end) + if ((!p2) || (p2 > art->pos_end)) return NEWS_PARSE_ERROR_BROKEN_FEED; len = p2 - p1; @@ -578,10 +578,10 @@ pos = parser->buffer_pos; p1 = strstr(pos, "pos_end)) + if ((p1) && (p1 < art->pos_end)) { p2 = _meta_block_find(&p1); - if (!p2 || (p2 > art->pos_end)) + if ((!p2) || (p2 > art->pos_end)) return NEWS_PARSE_ERROR_BROKEN_FEED; len = p2 - p1; art->url = E_NEW(char, len+1); @@ -604,10 +604,10 @@ pos = parser->buffer_pos; p1 = strstr(pos, "pos_end)) + if ((p1) && (p1 < art->pos_end)) { p2 = _meta_block_find(&p1); - if (!p2 || (p2 > art->pos_end)) + if ((!p2) || (p2 > art->pos_end)) return NEWS_PARSE_ERROR_BROKEN_FEED; len = p2 - p1; art->description = E_NEW(char, len+1); @@ -683,7 +683,7 @@ } } } - while (*p2 && (*p2 != '>')); + while ((*p2) && (*p2 != '>')); if (*p2) { memmove(p, p2 + 1, (buf + new_size) - (p2 + 1)); @@ -781,11 +781,11 @@ int len; char *p2 = p + 2; - while (*p2 && (*p2 != ';')) + while ((*p2) && (*p2 != ';')) p2++; p2++; len = p2 - p; - if ((len <= 3) || (len > 7) || !sscanf(p + 2, "%d", &i)) + if ((len <= 3) || (len > 7) || (!sscanf(p + 2, "%d", &i))) p = p_inc; /* next char (invalid html char number) */ else if ((i == 8216) || (i == 8217)) /* html num ' */ { @@ -817,7 +817,7 @@ *p = '<'; /* stay on the same char, could be start of a meta */ } /* > is checked when skipping meta */ - else if ( !strncmp(p_inc, "amp;", 4) && /* html & */ + else if ( (!strncmp(p_inc, "amp;", 4)) && /* html & */ ( (parser->oc.action != NEWS_PARSE_OC_ITEM_DESCRIPTION_CLEAN) || (*(p_inc+4) == '#') ) ) /* but if we are going to write on a tb, we must not convert, except if the next char is an html num char (cause we need to parse it next) */ //FIXME thats a quick fix, must fix evas_object_textblock so it supports & alone @@ -870,11 +870,11 @@ { char *p1, *p2; - if (!buf || !(*buf) || !(**buf)) return NULL; + if ((!buf) || (!(*buf)) || (!(**buf))) return NULL; p1 = *buf; - while (p1 && (*p1 != '>')) p1++; - if ( !p1 || !(*p1) || (*(p1-1) == '/') || !(*(p1+1)) ) return NULL; + while ((p1) && (*p1 != '>')) p1++; + if ( (!p1) || (!(*p1)) || (*(p1-1) == '/') || (!(*(p1+1))) ) return NULL; p1++; *buf = p1; @@ -889,7 +889,7 @@ char *p; int layer; - if (!buf || !(*buf)) return NULL; + if ((!buf) || (!(*buf))) return NULL; p = buf; layer = 0; @@ -899,7 +899,7 @@ if (beg_before) { /* Looking for autoclosing meta */ - while (*p && (*p != '>')) p++; + while ((*p) && (*p != '>')) p++; if (*(p-1) == '/') { DPARSE(("Searching end of an autoclosing meta !")); @@ -911,7 +911,7 @@ while (*p) { /* look for meta */ - while (*p && (*p != '<')) + while ((*p) && (*p != '<')) p++; if (*(p + 1)) { @@ -938,7 +938,7 @@ else { /* looking for autoclosing meta */ - while (*p && (*p != '>')) + while ((*p) && (*p != '>')) p++; if (*(p-1) == '/') ; /* skip meta */ @@ -964,8 +964,8 @@ } else { - while ( *p && (*p != '>') ) p++; - if ( !(*p) || !(*(p+1)) ) return NULL; + while ( (*p) && (*p != '>') ) p++; + if ( (!(*p)) || (!(*(p+1))) ) return NULL; p++; } @@ -982,12 +982,12 @@ item = prev; ibeg = strstr(parser->buffer_pos, meta); - if ( ibeg && + if ( (ibeg) && (ibeg < (parser->doc->server.buffer + parser->doc->server.buffer_size)) && (iend = _meta_block_find(&ibeg)) ) { ilen = iend - ibeg; - if ( !prev || (prev && strncmp(ibeg, prev, ilen)) ) + if ( (!prev) || ((prev) && (strncmp(ibeg, prev, ilen))) ) { memcpy(buf, ibeg, ilen); buf[ilen] = '\0'; @@ -1084,7 +1084,7 @@ while ((fa = eina_list_nth(parser->doc->articles, pos))) { /* if unread count max reached, remove even if unread */ - if (!fa->unread || (parser->doc->unread_count > NEWS_FEED_UNREAD_COUNT_MAX)) + if ((!fa->unread) || (parser->doc->unread_count > NEWS_FEED_UNREAD_COUNT_MAX)) { news_feed_article_del(fa); parser->changes = 1; Index: E-MODULES-EXTRA/news/src/news_config_dialog_feeds.c =================================================================== --- E-MODULES-EXTRA/news/src/news_config_dialog_feeds.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_config_dialog_feeds.c (working copy) @@ -146,7 +146,7 @@ f = eina_list_data_get(l); - if (f->icon && f->icon[0]) + if ((f->icon) && (f->icon[0])) { ic = e_icon_add(evas_object_evas_get(ilist)); e_icon_file_set(ic, f->icon); @@ -209,7 +209,7 @@ fc = eina_list_data_get(l); - if (fc->icon && fc->icon[0]) + if ((fc->icon) && (fc->icon[0])) { ic = e_icon_add(evas_object_evas_get(ilist)); e_icon_file_set(ic, fc->icon); @@ -541,7 +541,7 @@ cfdata = data; f = cfdata->selected_feed; if (!f) return; - if (f->item && f->item->viewer) + if ((f->item) && (f->item->viewer)) nv = f->item->viewer; cat = f->category; @@ -681,7 +681,7 @@ cfdata = data; c = cfdata->selected_category; if (!c) return; - if (c->feeds && eina_list_count(c->feeds)) + if ((c->feeds) && (eina_list_count(c->feeds))) { news_util_message_error_show(D_("There are feeds in this category.
" "You have to remove them first")); Index: E-MODULES-EXTRA/news/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/news/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/news/src/e_mod_main.c (working copy) @@ -175,7 +175,7 @@ if ((ni->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED_IMPORTANT) || ((ni->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED_IMPORTANT_UNREAD) - && _feed->doc && _feed->doc->unread_count)) + && (_feed->doc) && (_feed->doc->unread_count))) nb_feeds++; } NEWS_ITEM_FEEDS_FOREACH_END(); Index: E-MODULES-EXTRA/news/src/news_item.c =================================================================== --- E-MODULES-EXTRA/news/src/news_item.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_item.c (working copy) @@ -135,7 +135,7 @@ e_box_thaw(box); /* resize the gadcon */ - if (changed_order && ni->gcc->client_class) + if ((changed_order) && (ni->gcc->client_class)) ni->gcc->client_class->func.orient(ni->gcc, ni->gcc->gadcon->orient); } @@ -162,7 +162,7 @@ if (!ni->unread_count) was_empty = 1; ni->unread_count += nb; - if (was_empty || !ni->unread_count) + if ((was_empty) || (!ni->unread_count)) { if (ni->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED_UNREAD) news_item_refresh(ni, 1, 0, 1); @@ -199,7 +199,7 @@ _cb_item_open, ni); } - if (!ni->view.obj_mode_one || changed_order) + if ((!ni->view.obj_mode_one) || (changed_order)) { e_box_pack_end(box, obj); e_box_pack_options_set(obj, @@ -214,7 +214,7 @@ /* state */ - if (!ni->view.obj_mode_one || changed_state) + if ((!ni->view.obj_mode_one) || (changed_state)) { if (ni->unread_count) edje_object_signal_emit(obj, "e,state,new,set", "e"); Index: E-MODULES-EXTRA/news/src/news_utils.c =================================================================== --- E-MODULES-EXTRA/news/src/news_utils.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_utils.c (working copy) @@ -97,7 +97,7 @@ if (!key) key = getenv("LANGUAGE"); if (!key) key = getenv("LC_ALL"); if (!key) key = getenv("LANG"); - if (key && strncmp(key, "en", 2) && + if ((key) && (strncmp(key, "en", 2)) && (name = news_feed_lang_name_get(key))) { lang = E_NEW(News_Feed_Lang, 1); @@ -122,7 +122,7 @@ if (!proxy) return 0; strncpy(buf, proxy, sizeof(buf)); port = strrchr(buf, ':'); - if (!port || (port == buf)) return 0; + if ((!port) || (port == buf)) return 0; if (!sscanf(port+1, "%d", &c->proxy.port)) return 0; *port = '\0'; if (c->proxy.host) eina_stringshare_del(c->proxy.host); Index: E-MODULES-EXTRA/news/src/news_theme.c =================================================================== --- E-MODULES-EXTRA/news/src/news_theme.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_theme.c (working copy) @@ -9,7 +9,7 @@ const char * news_theme_file_get(char *category) { - if (category && e_theme_category_find(category)) + if ((category) && (e_theme_category_find(category))) return NULL; snprintf(_theme, sizeof(_theme), "%s/e-module-news.edj", e_module_dir_get(news->module)); return _theme; Index: E-MODULES-EXTRA/news/src/news_feed.c =================================================================== --- E-MODULES-EXTRA/news/src/news_feed.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_feed.c (working copy) @@ -191,7 +191,7 @@ /* 1. sort by name */ - if (sort && news->config->feed.sort_name) + if ((sort) && (news->config->feed.sort_name)) { list = news->config->feed.categories; list = eina_list_sort(list, eina_list_count(list), _cb_sort_cats); @@ -228,7 +228,7 @@ list_free = 1; } - if (cat->feeds_visible_free && cat->feeds_visible) + if ((cat->feeds_visible_free) && (cat->feeds_visible)) eina_list_free(cat->feeds_visible); cat->feeds_visible = list; @@ -286,7 +286,7 @@ char *host, *file; int update = 0; - if ( !name || !name[0] ) + if ( (!name) || (!name[0]) ) { news_util_message_error_show(D_("The name you entered is not correct")); return 0; @@ -297,7 +297,7 @@ return 0; } f2 = _feed_find(category, name); - if ( f2 && (f != f2) ) + if ( (f2) && (f != f2) ) { news_util_message_error_show(D_("A feed with the name %s already exists
" "in the %s category

" @@ -306,14 +306,14 @@ name, category->name); return 0; } - if (!language || !language[0]) + if ((!language) || (!language[0])) { news_util_message_error_show(D_("You need to select a language.")); return 0; } - if ( !url_feed || !url_feed[0] || - !(host = _get_host_from_url(url_feed)) || - !(file = _get_file_from_url(url_feed)) ) + if ( (!url_feed) || (!url_feed[0]) || + (!(host = _get_host_from_url(url_feed))) || + (!(file = _get_file_from_url(url_feed))) ) { news_util_message_error_show(D_("The url you specified is not correct")); if (host) free(host); @@ -354,7 +354,7 @@ f->url_home_ovrw = url_home_ovrw; if ( (f->url_feed != url_feed) && - (!f->url_feed || strcmp(f->url_feed, url_feed)) ) + ((!f->url_feed) || (strcmp(f->url_feed, url_feed))) ) { if (f->url_feed) eina_stringshare_del(f->url_feed); f->url_feed = eina_stringshare_add(url_feed); @@ -363,8 +363,8 @@ if (f->icon != icon) { - if ( f->icon && - !(icon && !strcmp(f->icon, icon)) ) + if ( (f->icon) && + (!((icon) && (!strcmp(f->icon, icon)))) ) { eina_stringshare_del(f->icon); f->icon = NULL; @@ -374,7 +374,7 @@ f->obj_icon = NULL; } } - if (icon && !f->icon) f->icon = eina_stringshare_add(icon); + if ((icon) && (!f->icon)) f->icon = eina_stringshare_add(icon); } f->icon_ovrw = icon_ovrw; @@ -385,7 +385,7 @@ && ( (f->item->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED_IMPORTANT) || ((f->item->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED_IMPORTANT_UNREAD) - && f->doc && f->doc->unread_count))) + && (f->doc) && (f->doc->unread_count)))) news_item_refresh(f->item, 1, 0, 1); } @@ -395,7 +395,7 @@ { News_Feed_Ref *ref; - if (f->icon && !f->obj_icon) + if ((f->icon) && (!f->obj_icon)) news_feed_obj_refresh(f, 1, 1); /* Feed Ref update */ @@ -421,7 +421,7 @@ E_FREE(f->file); f->file = file; - if (update && f->item) news_feed_update(f); + if ((update) && (f->item)) news_feed_update(f); return 1; } @@ -565,11 +565,11 @@ } /* 3. unread count */ - if (f->doc && f->doc->unread_count) + if ((f->doc) && (f->doc->unread_count)) news_item_unread_count_change(f->item, -1); /* 4. misc cleanups */ - if (ni && ni->viewer) + if ((ni) && (ni->viewer)) { if (ni->viewer->vfeeds.selected == f) ni->viewer->vfeeds.selected = NULL; @@ -624,9 +624,9 @@ else doc->server.nb_tries = 1; - if (news->config->proxy.enable && - news->config->proxy.port && - news->config->proxy.host && news->config->proxy.host[0]) + if ((news->config->proxy.enable) && + (news->config->proxy.port) && + (news->config->proxy.host) && (news->config->proxy.host[0])) doc->server.conn = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, news->config->proxy.host, news->config->proxy.port, @@ -646,10 +646,10 @@ } DFEED(("Trying to update feed %s", f->host)); - if (f->item && !f->item->loading_state) + if ((f->item) && (!f->item->loading_state)) news_item_loadingstate_refresh(f->item); - if (f->item && f->item->viewer && + if ((f->item) && (f->item->viewer) && (f->item->viewer->vfeeds.selected == f)) news_viewer_feed_selected_infos_refresh(f->item->viewer); @@ -686,28 +686,28 @@ evas_object_show(obj); } - if (!f->obj || changed_state) + if ((!f->obj) || (changed_state)) { - if (f->doc && f->doc->unread_count) + if ((f->doc) && (f->doc->unread_count)) edje_object_signal_emit(obj, "e,state,new,set", "e"); else edje_object_signal_emit(obj, "e,state,new,unset", "e"); } - if (!f->obj || changed_content) + if ((!f->obj) || (changed_content)) { edje_object_part_text_set(obj, "name", f->name); } /* icon */ - if (f->obj_icon && changed_content) + if ((f->obj_icon) && (changed_content)) { evas_object_del(f->obj_icon); f->obj_icon = NULL; } - if (!f->obj_icon && f->icon && f->icon[0]) + if ((!f->obj_icon) && (f->icon) && (f->icon[0])) { Evas_Object *icon; @@ -761,7 +761,7 @@ if (!feed->doc->unread_count) was_empty = 1; feed->doc->unread_count += nb; - if (was_empty || !feed->doc->unread_count) + if ((was_empty) || (!feed->doc->unread_count)) { if (nb > 0) news_item_unread_count_change(feed->item, 1); @@ -824,13 +824,13 @@ if (art->description) free(art->description); if (art->image) evas_object_del(art->image); - if (doc->feed->item && doc->feed->item->viewer) + if ((doc->feed->item) && (doc->feed->item->viewer)) { if (doc->feed->item->viewer->varticles.selected == art) doc->feed->item->viewer->varticles.selected = NULL; } - if (doc->feed->item && art->unread) + if ((doc->feed->item) && (art->unread)) news_feed_unread_count_change(doc->feed, -1); doc->articles = eina_list_remove(doc->articles, art); @@ -875,7 +875,7 @@ { News_Feed_Category *cat2; - if (!name || !name[0]) + if ((!name) || (!name[0])) { news_util_message_error_show(D_("You need to enter a name !")); return 0; @@ -883,7 +883,7 @@ /* that name already exists ? */ cat2 = _feed_category_find(name); - if (cat2 && (cat2 != cat)) + if ((cat2) && (cat2 != cat)) { news_util_message_error_show(D_("The name you entered is already used
" "by another category")); @@ -908,11 +908,11 @@ void news_feed_category_free(News_Feed_Category *cat) { - if (cat->feeds && eina_list_count(cat->feeds)) return; + if ((cat->feeds) && (eina_list_count(cat->feeds))) return; if (cat->name) eina_stringshare_del(cat->name); if (cat->icon) eina_stringshare_del(cat->icon); - if (cat->feeds_visible_free && cat->feeds_visible) + if ((cat->feeds_visible_free) && (cat->feeds_visible)) eina_list_free(cat->feeds_visible); if (cat->config_dialog) news_config_dialog_category_hide(cat); @@ -1038,7 +1038,7 @@ if (doc->parse.charset) eina_stringshare_del(doc->parse.charset); //FIXME: waiting ecore_con patch to be able to delete the server in all cases - if (doc->server.conn && doc->server.waiting_reply) ecore_con_server_del(doc->server.conn); + if ((doc->server.conn) && (doc->server.waiting_reply)) ecore_con_server_del(doc->server.conn); ecore_event_handler_del(doc->server.handler_add); ecore_event_handler_del(doc->server.handler_del); ecore_event_handler_del(doc->server.handler_data); @@ -1261,7 +1261,7 @@ DFEED(("Connection end")); - if (!doc->server.buffer || !doc->server.buffer_size) + if ((!doc->server.buffer) || (!doc->server.buffer_size)) { // TODO: error popup if (doc->feed->item) @@ -1345,7 +1345,7 @@ } else { - if (ni && ni->viewer && + if ((ni) && (ni->viewer) && (ni->viewer->vfeeds.selected == doc->feed)) news_viewer_feed_selected_infos_refresh(ni->viewer); } Index: E-MODULES-EXTRA/news/src/news_config_dialog_feed.c =================================================================== --- E-MODULES-EXTRA/news/src/news_config_dialog_feed.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_config_dialog_feed.c (working copy) @@ -130,7 +130,7 @@ fc = eina_list_data_get(l); - if (fc->icon && fc->icon[0]) + if ((fc->icon) && (fc->icon[0])) { ic = e_icon_add(evas_object_evas_get(ilist)); e_icon_file_set(ic, fc->icon); @@ -195,7 +195,7 @@ lang = eina_list_data_get(l); e_widget_ilist_append(ilist, NULL, lang->name, NULL, lang, NULL); - if (cfdata->language && !strcmp(cfdata->language, lang->key)) + if ((cfdata->language) && (!strcmp(cfdata->language, lang->key))) pos_to_select = pos; pos++; } @@ -449,7 +449,7 @@ old_cat->feeds = eina_list_remove(old_cat->feeds, f); f->category->feeds = eina_list_prepend(f->category->feeds, f); } - if (f->item && f->item->viewer) + if ((f->item) && (f->item->viewer)) news_viewer_refresh(f->item->viewer); } else Index: E-MODULES-EXTRA/news/src/news_config_dialog.c =================================================================== --- E-MODULES-EXTRA/news/src/news_config_dialog.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_config_dialog.c (working copy) @@ -380,9 +380,9 @@ eina_stringshare_del(c->proxy.host); c->proxy.host = NULL; } - if (cfdata->proxy.host && cfdata->proxy.host[0]) + if ((cfdata->proxy.host) && (cfdata->proxy.host[0])) c->proxy.host = eina_stringshare_add(cfdata->proxy.host); - if (cfdata->proxy.port && cfdata->proxy.port[0]) + if ((cfdata->proxy.port) && (cfdata->proxy.port[0])) sscanf(cfdata->proxy.port, "%d", &c->proxy.port); if ( (c->viewer.vfeeds.unread_first != cfdata->viewer.vfeeds.unread_first) || Index: E-MODULES-EXTRA/news/src/news_config_dialog_item_content.c =================================================================== --- E-MODULES-EXTRA/news/src/news_config_dialog_item_content.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_config_dialog_item_content.c (working copy) @@ -120,7 +120,7 @@ f = eina_list_data_get(l2); - if (f->icon && f->icon[0]) + if ((f->icon) && (f->icon[0])) { ic = e_icon_add(evas_object_evas_get(ilist)); e_icon_file_set(ic, f->icon); @@ -177,7 +177,7 @@ Evas_Object *ic = NULL; char buf[1024]; - if (_feed->icon && _feed->icon[0]) + if ((_feed->icon) && (_feed->icon[0])) { ic = e_icon_add(evas_object_evas_get(ilist)); e_icon_file_set(ic, _feed->icon); Index: E-MODULES-EXTRA/news/src/news_viewer.c =================================================================== --- E-MODULES-EXTRA/news/src/news_viewer.c (revision 51690) +++ E-MODULES-EXTRA/news/src/news_viewer.c (working copy) @@ -472,7 +472,7 @@ evas_object_del(nv->dialog.ftab_articles); nv->dialog.ftab_articles = NULL; } - if (nv->vfeeds.list_own && nv->vfeeds.list) + if ((nv->vfeeds.list_own) && (nv->vfeeds.list)) { eina_list_free(nv->vfeeds.list); nv->vfeeds.list = NULL; @@ -504,7 +504,7 @@ nv->vfeeds.button_setasread = NULL; } - if (nv->varticles.list_own && nv->varticles.list) + if ((nv->varticles.list_own) && (nv->varticles.list)) { eina_list_free(nv->varticles.list); nv->varticles.list = NULL; @@ -542,7 +542,7 @@ DD(("TRIGGERED cb feed ilist (%s)", feed->name)); if ((nv->vfeeds.selected == feed) && - !feed->doc->ui_needrefresh) + (!feed->doc->ui_needrefresh)) { /* show feed infos in vcontent */ _vcontent_feed_infos_set(nv); @@ -560,7 +560,7 @@ changed = 1; nv->vfeeds.selected = feed; } - if (feed->icon && feed->icon[0]) + if ((feed->icon) && (feed->icon[0])) { Evas_Object *ic; @@ -600,9 +600,9 @@ "%s

" "%s

" "%s", - (art->title && art->title[0]) ? art->title : "No title", + ((art->title) && (art->title[0])) ? art->title : "No title", buf_date, - (art->description && art->description[0])? art->description : "No description text", + ((art->description) && (art->description[0]))? art->description : "No description text", (art->url) ? "||click on the text to open article in a browser||" : ""); _vcontent_text_set(nv, buf); @@ -644,7 +644,7 @@ f = nv->vfeeds.selected; if (nv->vfeeds.button_feed) { - if (f && f->url_home && f->url_home[0]) + if ((f) && (f->url_home) && (f->url_home[0])) e_widget_disabled_set(nv->vfeeds.button_feed, 0); else e_widget_disabled_set(nv->vfeeds.button_feed, 1); @@ -658,7 +658,7 @@ } if (nv->vfeeds.button_setasread) { - if (f && f->doc && f->doc->unread_count) + if ((f) && (f->doc) && (f->doc->unread_count)) e_widget_disabled_set(nv->vfeeds.button_setasread, 0); else e_widget_disabled_set(nv->vfeeds.button_setasread, 1); @@ -685,7 +685,7 @@ nv = data; f = nv->vfeeds.selected; - if (!f || !f->doc) return; + if ((!f) || (!f->doc)) return; news_feed_update(f); } @@ -698,7 +698,7 @@ nv = data; f = nv->vfeeds.selected; - if (!f || !f->doc) return; + if ((!f) || (!f->doc)) return; news_feed_read_set(f); } @@ -717,7 +717,7 @@ e_widget_ilist_clear(ilist); feed = nv->vfeeds.selected; - if (!feed || !feed->doc) return; + if ((!feed) || (!feed->doc)) return; e_widget_ilist_freeze(ilist); if (news->config->viewer.varticles.unread_first) @@ -888,7 +888,7 @@ f->name, f->category->name, buf_error, - (f->description && f->description[0]) ? f->description : "No description for this feed", + ((f->description) && (f->description[0])) ? f->description : "No description for this feed", buf_infos, buf_conn, buf_unread); _vcontent_text_set(nv, buf); @@ -939,7 +939,7 @@ list = NULL; reads = NULL; NEWS_ITEM_FEEDS_FOREACH_BEG(ni); - if (_feed->doc && _feed->doc->unread_count) + if ((_feed->doc) && (_feed->doc->unread_count)) list = eina_list_append(list, _ref); else reads = eina_list_append(reads, _ref); Index: E-MODULES-EXTRA/everything-tracker/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/everything-tracker/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/everything-tracker/src/e_mod_main.c (working copy) @@ -309,7 +309,7 @@ return; dbus_message_iter_get_basic(iter, &mime); - if (path && name && mime) + if ((path) && (name) && (mime)) file = _file_item_get(p, urn, path, name, mime, 0); if (file) @@ -325,7 +325,7 @@ char *label, *path, *detail; Eina_List *l; - if (!it || strcmp(urn, EVRY_ITEM(it)->id)) + if ((!it) || (strcmp(urn, EVRY_ITEM(it)->id))) { label = evry->util_url_unescape(urn + 10, 0); @@ -340,7 +340,7 @@ it = _query_item_get(p, urn, label, detail, query_tracks_for_album, urn); - if (it && (!EVRY_ITEM(it)->data)) + if ((it) && (!EVRY_ITEM(it)->data)) *items = eina_list_append(*items, it); } else @@ -372,7 +372,7 @@ char *label, *path; Eina_List *l; - if (!it || strcmp(urn, EVRY_ITEM(it)->id)) + if ((!it) || (strcmp(urn, EVRY_ITEM(it)->id))) { label = evry->util_url_unescape(urn + 11, 0); @@ -512,7 +512,7 @@ return NULL; } - if (match && match2) + if ((match) && (match2)) { _query = malloc(sizeof(char) * (strlen(match) + strlen(match2) + strlen(query))); sprintf(_query, query, match, match2); @@ -548,8 +548,8 @@ { Plugin *p; - if (!CHECK_TYPE(item, TRACKER_QUERY) && - !CHECK_TYPE(item, TRACKER_MUSIC)) + if ((!CHECK_TYPE(item, TRACKER_QUERY)) && + (!CHECK_TYPE(item, TRACKER_MUSIC))) return NULL; GET_PLUGIN(parent, plugin); @@ -646,23 +646,23 @@ return 0; } - if (input && p->filter_result && p->files) + if ((input) && (p->filter_result) && (p->files)) { Eina_List *l; EVRY_PLUGIN_ITEMS_CLEAR(p); EINA_LIST_FOREACH(p->files, l, it) - if (!input || evry->fuzzy_match(it->label, input)) + if ((!input) || (evry->fuzzy_match(it->label, input))) EVRY_PLUGIN_ITEM_APPEND(p, it); - if (p->parent && EVRY_PLUGIN(p)->items) return 1; + if ((p->parent) && (EVRY_PLUGIN(p)->items)) return 1; } if (p->pnd) dbus_pending_call_cancel(p->pnd); p->pnd = NULL; - if ((len > 0 && len >= plugin->config->min_query) && isalnum(input[0])) + if ((len > 0 && (len >= plugin->config->min_query)) && (isalnum(input[0]))) { p->fetching = EINA_TRUE; @@ -670,7 +670,7 @@ p->pnd = _send_query(p->query, (p->match ? p->match : ""), buf, 0, _dbus_cb_reply, p); } - else if (len == 0 && plugin->config->min_query == 0) + else if ((len == 0) && (plugin->config->min_query == 0)) { p->fetching = EINA_TRUE; @@ -764,7 +764,7 @@ { if (CHECK_SUBTYPE(item, FILE_LIST)) { - if (!item->label || !item->detail) + if ((!item->label) || (!item->detail)) return evry->icon_theme_get("folder", e); char *suma, *sumb, *a; @@ -877,23 +877,23 @@ if (!dbus_active) return 1; - if (CHECK_TYPE(ev->it1, EVRY_TYPE_FILE) && - (ev->action && !strcmp(ev->action, "Move to Trash")) && + if ((CHECK_TYPE(ev->it1, EVRY_TYPE_FILE)) && + ((ev->action) && (!strcmp(ev->action, "Move to Trash"))) && (url = evry->file_url_get(EVRY_FILE(ev->it1)))) { printf("file deleted %s\n", url); _send_query(query_remove_file, url, NULL, 1, NULL, NULL); } - else if (CHECK_TYPE(ev->it1, MPRIS_TRACK) && - (ev->action && !strcmp(ev->action, "Play Track")) && + else if ((CHECK_TYPE(ev->it1, MPRIS_TRACK)) && + ((ev->action) && (!strcmp(ev->action, "Play Track"))) && (url = evry->file_url_get(EVRY_FILE(ev->it1)))) { _send_query(query_usage_count, url, NULL, 0, _dbus_cb_track_count, NULL); } - else if (CHECK_TYPE(ev->it1, EVRY_TYPE_FILE) && - (ev->action && !strcmp(ev->action, "Play File")) && + else if ((CHECK_TYPE(ev->it1, EVRY_TYPE_FILE)) && + ((ev->action) && (!strcmp(ev->action, "Play File"))) && (url = evry->file_url_get(EVRY_FILE(ev->it1)))) { _send_query(query_usage_count, url, NULL, 0, Index: E-MODULES-EXTRA/exebuf/src/exebuf.c =================================================================== --- E-MODULES-EXTRA/exebuf/src/exebuf.c (revision 51690) +++ E-MODULES-EXTRA/exebuf/src/exebuf.c (working copy) @@ -425,7 +425,7 @@ { if (exe_sel) { - if (exe_sel->desktop && which_list != EXE_LIST) + if ((exe_sel->desktop) && (which_list != EXE_LIST)) e_exec(exebuf->zone, exe_sel->desktop, NULL, NULL, "exebuf"); else e_exec(exebuf->zone, NULL, exe_sel->file, NULL, "exebuf"); @@ -452,7 +452,7 @@ else active_cmd = cmd_buf; - if (active_cmd && active_cmd[0]) + if ((active_cmd) && (active_cmd[0])) { /* Copy the terminal command to the start of the string... * making sure it has a null terminator if greater than EXEBUFLEN */ @@ -982,7 +982,7 @@ _e_exebuf_matches_clear(); if (!cmd_buf[0]) return; - if (hist && eina_list_count(history)) + if ((hist) && (eina_list_count(history))) { Eina_List *hist_matches = NULL; @@ -1140,7 +1140,7 @@ max = exebuf_conf->max_eap_list; evas_event_thaw(exebuf->evas); e_box_freeze(eap_list_object); - for (i = 0, l = eap_matches; l && (i < max); l = l->next, i++) + for (i = 0, l = eap_matches; (l) && (i < max); l = l->next, i++) { Efreet_Desktop *desktop; E_Exebuf_Exe *exe; @@ -1158,9 +1158,9 @@ exe->bg_object = o; e_theme_edje_object_set(o, "base/theme/exebuf", "e/widgets/exebuf/item"); - if (e_config->menu_eap_name_show && exe->desktop->name) opt |= 0x4; - if (e_config->menu_eap_generic_show && exe->desktop->generic_name) opt |= 0x2; - if (e_config->menu_eap_comment_show && exe->desktop->comment) opt |= 0x1; + if ((e_config->menu_eap_name_show) && (exe->desktop->name)) opt |= 0x4; + if ((e_config->menu_eap_generic_show) && (exe->desktop->generic_name)) opt |= 0x2; + if ((e_config->menu_eap_comment_show) && (exe->desktop->comment)) opt |= 0x1; if (opt == 0x7) snprintf(buf, sizeof(buf), "%s (%s) [%s]", exe->desktop->name, exe->desktop->generic_name, exe->desktop->comment); else if (opt == 0x6) snprintf(buf, sizeof(buf), "%s (%s)", exe->desktop->name, exe->desktop->generic_name); else if (opt == 0x5) snprintf(buf, sizeof(buf), "%s [%s]", exe->desktop->name, exe->desktop->comment); @@ -1198,7 +1198,7 @@ max = exebuf_conf->max_exe_list; e_box_freeze(exe_list_object); - for (i = 0, l = exe_matches; l && (i < max); l = l->next, i++) + for (i = 0, l = exe_matches; (l) && (i < max); l = l->next, i++) { E_Exebuf_Exe *exe; Evas_Coord mw, mh; @@ -1292,7 +1292,7 @@ EINA_LIST_FREE(ll, desktop) { - if (desktop->exec && !strncmp(file, desktop->exec, len)) + if ((desktop->exec) && (!strncmp(file, desktop->exec, len))) found = desktop; else efreet_desktop_free(desktop); @@ -1415,15 +1415,15 @@ _e_exebuf_complete(); else if (!strcmp(ev->key, "Tab")) _e_exebuf_complete(); - else if (!strcmp(ev->key, "Return") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) + else if ((!strcmp(ev->key, "Return")) && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) _e_exebuf_exec_term(); else if (!strcmp(ev->key, "Return")) _e_exebuf_exec(); - else if (!strcmp(ev->key, "KP_Enter") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) + else if ((!strcmp(ev->key, "KP_Enter")) && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) _e_exebuf_exec_term(); else if (!strcmp(ev->key, "KP_Enter")) _e_exebuf_exec(); - else if (!strcmp(ev->key, "u") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) + else if ((!strcmp(ev->key, "u")) && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)) _e_exebuf_clear(); else if (!strcmp(ev->key, "Escape")) e_exebuf_hide(); @@ -1455,7 +1455,7 @@ ev = event; if (ev->event_window != input_window) return EINA_TRUE; - if (ev_last_mouse_exe && (exe_sel != ev_last_mouse_exe)) + if ((ev_last_mouse_exe) && (exe_sel != ev_last_mouse_exe)) { if (exe_sel) _e_exebuf_exe_desel(exe_sel); exe_sel = ev_last_mouse_exe; @@ -1493,9 +1493,9 @@ ev_last_is_mouse = 1; if (ev_last_mouse_exe) { - if (exe_sel && (exe_sel != ev_last_mouse_exe)) + if ((exe_sel) && (exe_sel != ev_last_mouse_exe)) _e_exebuf_exe_desel(exe_sel); - if (!exe_sel || (exe_sel != ev_last_mouse_exe)) + if ((!exe_sel) || (exe_sel != ev_last_mouse_exe)) { exe_sel = ev_last_mouse_exe; which_list = ev_last_which_list; @@ -1616,7 +1616,7 @@ int different = 0; /* FIXME: check theat they match or not */ - for (l = exe_list, l2 = exe_list2; l && l2; l = l->next, l2 = l2->next) + for (l = exe_list, l2 = exe_list2; (l) && (l2); l = l->next, l2 = l2->next) { if (strcmp(l->data, l2->data)) { Index: E-MODULES-EXTRA/mem/src/machdep_linux.c =================================================================== --- E-MODULES-EXTRA/mem/src/machdep_linux.c (revision 51690) +++ E-MODULES-EXTRA/mem/src/machdep_linux.c (working copy) @@ -32,11 +32,11 @@ mtotal = value; else if (!strcmp (field, "MemFree:")) mfree = value; - else if (ci->real_ignore_buffers && (!strcmp (field, "Buffers:"))) + else if ((ci->real_ignore_buffers) && (!strcmp (field, "Buffers:"))) mfree += value; - else if (ci->real_ignore_cached && (!strcmp (field, "Cached:"))) + else if ((ci->real_ignore_cached) && (!strcmp (field, "Cached:"))) mfree += value; - else if (ci->real_ignore_cached && (!strcmp (field, "SwapCached:"))) + else if ((ci->real_ignore_cached) && (!strcmp (field, "SwapCached:"))) sfree += value; else if (!strcmp (field, "SwapTotal:")) stotal = value; Index: E-MODULES-EXTRA/everything-skel/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/everything-skel/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/everything-skel/e_mod_main.c (working copy) @@ -295,7 +295,7 @@ return; dbus_message_iter_get_basic(iter, &mime); - if (path && name && mime) + if ((path) && (name) && (mime)) file = _file_item_get(p, urn, path, name, mime, 0); if (file) @@ -311,7 +311,7 @@ char *label, *path, *detail; Eina_List *l; - if (!it || strcmp(urn, EVRY_ITEM(it)->id)) + if ((!it) || (strcmp(urn, EVRY_ITEM(it)->id))) { label = evry_util_unescape(urn + 10, 0); @@ -326,7 +326,7 @@ it = _query_item_get(p, urn, label, detail, query_tracks_for_album, urn); - if (it && (!EVRY_ITEM(it)->data)) + if ((it) && (!EVRY_ITEM(it)->data)) *items = eina_list_append(*items, it); } else @@ -358,7 +358,7 @@ char *label, *path; Eina_List *l; - if (!it || strcmp(urn, EVRY_ITEM(it)->id)) + if ((!it) || (strcmp(urn, EVRY_ITEM(it)->id))) { label = evry_util_unescape(urn + 11, 0); @@ -483,7 +483,7 @@ return NULL; } - if (match && match2) + if ((match) && (match2)) { _query = malloc(sizeof(char) * (strlen(match) + strlen(match2) + strlen(query))); sprintf(_query, query, match, match2); @@ -527,8 +527,8 @@ p->base = *plugin; p->base.items = NULL; - if (item && evry_item_type_check(item, "TRACKER_QUERY", NULL) || - item && evry_item_type_check(item, "TRACKER_MUSIC", NULL)) + if (((item) && (evry_item_type_check(item, "TRACKER_QUERY", NULL))) || + ((item) && (evry_item_type_check(item, "TRACKER_MUSIC", NULL)))) { QUERY_ITEM(it, item); p->parent = EINA_TRUE; @@ -536,7 +536,7 @@ if (it->match) p->match = eina_stringshare_add(it->match); } - else if (item && evry_item_type_check(item, "FILE", NULL)) + else if ((item) && (evry_item_type_check(item, "FILE", NULL))) { GET_FILE(it, item); p->parent = EINA_TRUE; @@ -591,7 +591,7 @@ GET_PLUGIN(p, plugin); - if (p->filter_result && p->files) + if ((p->filter_result) && (p->files)) { Evry_Item *it; Eina_List *l; @@ -599,17 +599,17 @@ EVRY_PLUGIN_ITEMS_CLEAR(p); EINA_LIST_FOREACH(p->files, l, it) - if (!input || evry_fuzzy_match(it->label, input)) + if ((!input) || (evry_fuzzy_match(it->label, input))) EVRY_PLUGIN_ITEM_APPEND(p, it); - if (p->parent && p->base.items) return 1; + if ((p->parent) && (p->base.items)) return 1; } if (p->pnd) dbus_pending_call_cancel(p->pnd); p->pnd = NULL; - if (input && (strlen(input) > 2) && isalnum(input[0])) + if ((input) && (strlen(input) > 2) && (isalnum(input[0]))) { if (p->input) eina_stringshare_del(p->input); p->input = eina_stringshare_add(input); @@ -726,11 +726,11 @@ { if (evry_item_type_check(item, "TRACKER_MUSIC", NULL)) { - if (item->subtype && item->subtype == _file_list) + if ((item->subtype) && (item->subtype == _file_list)) { QUERY_ITEM(it, item); - if (!item->label || !item->detail) + if ((!item->label) || (!item->detail)) return evry_icon_theme_get("folder", e); char *suma, *sumb, *a; @@ -920,7 +920,7 @@ if (_file_list) eina_stringshare_del(_file_list); - if (_active && e_datastore_get("everything_loaded")) + if ((_active) && (e_datastore_get("everything_loaded"))) _plugins_shutdown(); module = NULL; Index: E-MODULES-EXTRA/mail/src/imap2.c =================================================================== --- E-MODULES-EXTRA/mail/src/imap2.c (revision 51690) +++ E-MODULES-EXTRA/mail/src/imap2.c (working copy) @@ -53,7 +53,7 @@ else type = ECORE_CON_REMOTE_SYSTEM; - if (ecore_con_ssl_available_get () && (ic->config->ssl)) + if ((ecore_con_ssl_available_get ()) && (ic->config->ssl)) { D ("Use SSL for %s:%s\n", ic->config->host, ic->config->new_path); switch (ic->config->ssl) Index: E-MODULES-EXTRA/mail/src/imap.c =================================================================== --- E-MODULES-EXTRA/mail/src/imap.c (revision 51690) +++ E-MODULES-EXTRA/mail/src/imap.c (working copy) @@ -44,7 +44,7 @@ else type = ECORE_CON_REMOTE_SYSTEM; - if (ecore_con_ssl_available_get () && (is->ssl)) + if ((ecore_con_ssl_available_get ()) && (is->ssl)) type |= ECORE_CON_USE_SSL; is->state = IMAP_STATE_DISCONNECTED; is->server = Index: E-MODULES-EXTRA/everything-websearch/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/everything-websearch/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/everything-websearch/src/e_mod_main.c (working copy) @@ -225,7 +225,7 @@ Ecore_Con_Event_Url_Data *ev = event; Url_Data *dd; - if (!ev || !data || !(data == _conf)) + if ((!ev) || (!data) || (!(data == _conf))) return EINA_TRUE; if (!(dd = ecore_con_url_data_get(ev->url_con))) @@ -244,7 +244,7 @@ Ecore_Con_Event_Url_Progress *ev = event; Url_Data *dd; - if (!ev || !data || !(data == _conf)) + if ((!ev) || (!data) || (!(data == _conf))) return EINA_TRUE; if (!(dd = ecore_con_url_data_get(ev->url_con))) @@ -262,7 +262,7 @@ Ecore_Con_Event_Url_Complete *ev = event; Url_Data *dd; - if (!ev || !data || !(data == _conf)) + if ((!ev) || (!data) || (!(data == _conf))) return EINA_TRUE; if (!(dd = ecore_con_url_data_get(ev->url_con))) @@ -322,7 +322,7 @@ rsp = _json_parse(msg, len); - if (rsp && rsp->list && + if ((rsp) && (rsp->list) && (d = rsp->list->data) && (d->type == JSON_ARRAY_BEGIN) && (d = d->list->data) && @@ -439,7 +439,7 @@ const char *title, *url, *thumb; d = _json_data_find(rsp, "entry", 3); - if (d && d->list) + if ((d) && (d->list)) { d = d->list->data; @@ -457,7 +457,7 @@ (d2 = _json_data_find(d2, "url", 2))) thumb = d2->value; - if (title && url && thumb) + if ((title) && (url) && (thumb)) { it = EVRY_ITEM_NEW(Web_Link, p, NULL, _web_link_icon_get, _web_link_free); EVRY_ITEM_LABEL_SET(it, title); @@ -488,7 +488,7 @@ rsp = _json_parse(beg, len); - if (rsp && rsp->list && + if ((rsp) && (rsp->list) && (d = rsp->list->data) && (d->type == JSON_ARRAY_BEGIN) && (d = d->list->data) && @@ -498,7 +498,7 @@ { ll = d2->values; - if (!ll->data || !ll->next->data) + if ((!ll->data) || (!ll->next->data)) continue; val = ll->data; @@ -527,7 +527,7 @@ p->request = parent->request; p->data_cb = parent->data_cb; - if (it && CHECK_TYPE(it, EVRY_TYPE_TEXT)) + if ((it) && (CHECK_TYPE(it, EVRY_TYPE_TEXT))) { p->browse_input = eina_stringshare_ref(it->label); p->browse_mode = 1; @@ -633,7 +633,7 @@ p->input = eina_stringshare_ref(p->browse_input); } } - else if (input && strlen(input) >= plugin->config->min_query) + else if ((input) && (strlen(input) >= plugin->config->min_query)) { p->input = eina_stringshare_add(input); } @@ -695,7 +695,7 @@ { EINA_LIST_FOREACH(e_border_client_list(), l, bd) { - if (bd->desktop && bd->desktop == app->desktop) + if ((bd->desktop) && (bd->desktop == app->desktop)) { e_desk_show(bd->desk); e_border_raise(bd); @@ -752,7 +752,7 @@ Youtube_Data *yd = d; struct stat s; - if (yd->ready || yd->tries++ > 10) + if ((yd->ready) || (yd->tries++ > 10)) { _youtube_dl_finish(yd, 1); return EINA_FALSE; @@ -762,7 +762,7 @@ { if (s.st_size < 262144) { - if (!yd->ready && yd->tries > 5 && s.st_size < 1024) + if ((!yd->ready) && (yd->tries > 5) && (s.st_size < 1024)) { _youtube_dl_finish(yd, 1); return EINA_FALSE; @@ -816,7 +816,7 @@ Youtube_Data *yd = data; Ecore_Exe_Event_Del *e = event; - if (e->exe != yd->exe1 && e->exe != yd->exe2) + if ((e->exe != yd->exe1) && (e->exe != yd->exe2)) return EINA_TRUE; if (e->exe == yd->exe1) ecore_exe_kill(yd->exe2); @@ -850,7 +850,7 @@ msg = dd->data; msg = strstr(msg, "var swfConfig = "); - if ((!msg) || !(msg += 16)) + if ((!msg) || (!(msg += 16))) goto error; rsp = _json_parse(msg, dd->size - (msg - dd->data)); @@ -864,7 +864,7 @@ if (d2) t = d2->value; } - if (!t || !video_id) + if ((!t) || (!video_id)) goto error; snprintf(url, sizeof(url), @@ -961,7 +961,7 @@ strcpy(file, it->label); for (i = 0; i < strlen(it->label); i++) - if (file[i] == '\"' || file[i] == '/') + if ((file[i] == '\"') || (file[i] == '/')) file[i] = ' '; snprintf(path, sizeof(path), "%s/%s.mp3", @@ -1140,7 +1140,7 @@ static int _action_upload_check(Evry_Action *act, const Evry_Item *it) { - return (EVRY_FILE(it)->mime && !(strncmp(EVRY_FILE(it)->mime, "image/", 6))); + return ((EVRY_FILE(it)->mime) && (!(strncmp(EVRY_FILE(it)->mime, "image/", 6)))); } @@ -1514,9 +1514,9 @@ #undef D _conf = e_config_domain_load(_config_domain, _conf_edd); - if (_conf && !e_util_module_config_check + if ((_conf) && (!e_util_module_config_check (_("Everything Websearch"), _conf->version, - MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION)) + MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))) { _conf_free(); } @@ -1668,13 +1668,13 @@ EINA_LIST_FOREACH(jd->list, l, d) { - if (d && d->key == key) + if ((d) && (d->key == key)) { DBG("found %d %s",level, key); break; } - if (level && (d = _json_data_find2(d, key, level - 1))) + if ((level) && (d = _json_data_find2(d, key, level - 1))) break; } @@ -1738,7 +1738,7 @@ return NULL; } - if ((ret = json_parser_string(&parser, string, len, NULL)) && !(d->cur == d)) + if ((ret = json_parser_string(&parser, string, len, NULL)) && (!(d->cur == d))) { ERR("%d\n", ret); _json_data_free(d); Index: E-MODULES-EXTRA/everything-websearch/src/json.c =================================================================== --- E-MODULES-EXTRA/everything-websearch/src/json.c (revision 51690) +++ E-MODULES-EXTRA/everything-websearch/src/json.c (working copy) @@ -308,10 +308,10 @@ void *ptr; int max = parser->config.max_data; - if (max > 0 && parser->buffer_size == max) + if ((max > 0) && (parser->buffer_size == max)) return JSON_ERROR_DATA_LIMIT; newsize = parser->buffer_size * 2; - if (max > 0 && newsize > max) + if ((max > 0) && (newsize > max)) newsize = max; ptr = parser_realloc(parser, parser->buffer, newsize * sizeof(char)); @@ -400,7 +400,7 @@ parser->buffer_offset -= 4; /* fast case */ - if (!parser->unicode_multi && uval < 0x80) { + if ((!parser->unicode_multi) && (uval < 0x80)) { b[parser->buffer_offset++] = (char) uval; return 0; } @@ -619,7 +619,7 @@ ? parser->config.buffer_initial_size : LIBJSON_DEFAULT_BUFFER_SIZE; - if (parser->config.max_data > 0 && parser->buffer_size > parser->config.max_data) + if ((parser->config.max_data > 0) && (parser->buffer_size > parser->config.max_data)) parser->buffer_size = parser->config.max_data; parser->buffer = parser_calloc(parser, parser->buffer_size, sizeof(char)); @@ -646,7 +646,7 @@ int json_parser_is_done(json_parser *parser) { /* need to compare the state to !GO to not accept empty document */ - return parser->stack_offset == 0 && parser->state != STATE_GO; + return (parser->stack_offset == 0) && (parser->state != STATE_GO); } /** json_parser_string append a string s with a specific length to the parser @@ -765,12 +765,12 @@ { int enterobj = printer->enter_object; - if (!enterobj && !printer->afterkey && (type != JSON_ARRAY_END && type != JSON_OBJECT_END)) { + if ((!enterobj) && (!printer->afterkey) && ((type != JSON_ARRAY_END) && (type != JSON_OBJECT_END))) { printer->callback(printer->userdata, ",", 1); if (pretty) print_indent(printer); } - if (pretty && (enterobj && !printer->first && (type != JSON_ARRAY_END && type != JSON_OBJECT_END))) { + if ((pretty) && ((enterobj) && (!printer->first) && ((type != JSON_ARRAY_END) && (type != JSON_OBJECT_END)))) { print_indent(printer); } @@ -791,7 +791,7 @@ case JSON_ARRAY_END: case JSON_OBJECT_END: printer->indentlevel--; - if (pretty && !enterobj) print_indent(printer); + if ((pretty) && (!enterobj)) print_indent(printer); printer->callback(printer->userdata, (type == JSON_OBJECT_END) ? "}" : "]", 1); break; case JSON_INT: printer->callback(printer->userdata, data, length); break; Index: E-MODULES-EXTRA/mpdule/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/mpdule/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/mpdule/src/e_mod_main.c (working copy) @@ -531,8 +531,8 @@ while ((entity = mpd_getNextInfoEntity (mpd))) { - if (entity->type == MPD_INFO_ENTITY_TYPE_SONG && - entity->info.song->id == status->songid) + if ((entity->type == MPD_INFO_ENTITY_TYPE_SONG) && + (entity->info.song->id == status->songid)) { mpd_Song *song = entity->info.song; Index: E-MODULES-EXTRA/forecasts/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/forecasts/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/forecasts/src/e_mod_main.c (working copy) @@ -943,7 +943,7 @@ if (inst->ci != ci) continue; int area_changed = 0; - if (inst->area && strcmp(inst->area, inst->ci->code)) + if ((inst->area) && (strcmp(inst->area, inst->ci->code))) area_changed = 1; if (inst->area) eina_stringshare_del(inst->area); Index: E-MODULES-EXTRA/photo/src/photo_item.c =================================================================== --- E-MODULES-EXTRA/photo/src/photo_item.c (revision 51690) +++ E-MODULES-EXTRA/photo/src/photo_item.c (working copy) @@ -146,7 +146,7 @@ void photo_item_timer_set(Photo_Item *pi, int active, int time) { - if (time && (time < ITEM_TIMER_S_MIN)) + if ((time) && (time < ITEM_TIMER_S_MIN)) return; pi->config->timer_active = active; @@ -204,18 +204,18 @@ if (action) photo_item_action_label(pi); - } while ( l && (l = eina_list_next(l)) && (pi = eina_list_data_get(l)) ); + } while ( (l) && (l = eina_list_next(l)) && (pi = eina_list_data_get(l)) ); } Picture *photo_item_picture_current_get(Photo_Item *pi) { Picture *p = NULL; - if (!pi->edje_part && pi->picture0) + if ((!pi->edje_part) && (pi->picture0)) { p = pi->picture0; } - if (pi->edje_part && pi->picture1) + if ((pi->edje_part) && (pi->picture1)) { p = pi->picture1; } @@ -227,11 +227,11 @@ { Evas_Object *p = NULL; - if (!pi->edje_part && pi->picture0) + if ((!pi->edje_part) && (pi->picture0)) { p = pi->picture0->picture; } - if (pi->edje_part && pi->picture1) + if ((pi->edje_part) && (pi->picture1)) { p = pi->picture1->picture; } @@ -300,7 +300,7 @@ /* from list */ /* if already waiting for pictures, dont change */ - if (pi->local_ev_fill_handler || pi->net_ev_fill_handler) + if ((pi->local_ev_fill_handler) || (pi->net_ev_fill_handler)) return 0; picture = _picture_new_get(pi); Index: E-MODULES-EXTRA/photo/src/photo_picture.c =================================================================== --- E-MODULES-EXTRA/photo/src/photo_picture.c (revision 51690) +++ E-MODULES-EXTRA/photo/src/photo_picture.c (working copy) @@ -39,9 +39,9 @@ ext = strrchr(path, '.'); if (!ext) return NULL; - if (strcasecmp(ext, ".jpg") && strcasecmp(ext, ".JPG") && - strcasecmp(ext, ".jpeg") && strcasecmp(ext, ".JPEG") && - strcasecmp(ext, ".png") && strcasecmp(ext, ".PNG")) + if ((strcasecmp(ext, ".jpg")) && (strcasecmp(ext, ".JPG")) && + (strcasecmp(ext, ".jpeg")) && (strcasecmp(ext, ".JPEG")) && + (strcasecmp(ext, ".png")) && (strcasecmp(ext, ".PNG"))) return NULL; DPICL(("New picture : file %s", path)); @@ -243,8 +243,8 @@ { n++; DMAIN(("set_bg check remove %s", file)); - if (!e_config->desktop_default_background || - strcmp(e_config->desktop_default_background, file)) + if ((!e_config->desktop_default_background) || + (strcmp(e_config->desktop_default_background, file))) { DMAIN(("set_bg remove %s !", file)); if (ecore_file_exists(file)) Index: E-MODULES-EXTRA/photo/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/photo/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/photo/src/e_mod_main.c (working copy) @@ -229,11 +229,11 @@ char *version; path = e_theme_edje_file_get(PHOTO_THEME_IN_E, PHOTO_THEME_ITEM); - if (path && path[0]) + if ((path) && (path[0])) { version = edje_file_data_get(path, "version"); DD(("THEME E path %s version %s", path, version)); - if ( !version || strcmp(version, PHOTO_THEME_VERSION) ) + if ( (!version) || (strcmp(version, PHOTO_THEME_VERSION)) ) { free(version); return 0; @@ -245,7 +245,7 @@ snprintf(buf, sizeof(buf), "%s/photo.edj", e_module_dir_get(photo->module)); version = edje_file_data_get(buf, "version"); DD(("THEME own version %s", version)); - if ( !version || strcmp(version, PHOTO_THEME_VERSION) ) + if ( (!version) || (strcmp(version, PHOTO_THEME_VERSION)) ) { free(version); return 0; Index: E-MODULES-EXTRA/photo/src/photo_picture_histo.c =================================================================== --- E-MODULES-EXTRA/photo/src/photo_picture_histo.c (revision 51690) +++ E-MODULES-EXTRA/photo/src/photo_picture_histo.c (working copy) @@ -85,7 +85,7 @@ picture = eina_list_nth(pi->histo.list, new_pos); if (picture) { - if (!picture->pi && !picture->delete_me) + if ((!picture->pi) && (!picture->delete_me)) pi->histo.pos = new_pos; else picture = NULL; @@ -183,7 +183,7 @@ E_Menu_Item *mi; mi = eina_list_data_get(l); - if (!mi || mi->separator) continue; + if ((!mi) || (mi->separator)) continue; evas_object_event_callback_add(mi->event_object, EVAS_CALLBACK_MOUSE_IN, _cb_menu_pre_select, mi); evas_object_event_callback_add(mi->event_object, EVAS_CALLBACK_MOUSE_OUT, Index: E-MODULES-EXTRA/photo/src/photo_picture_local.c =================================================================== --- E-MODULES-EXTRA/photo/src/photo_picture_local.c (revision 51690) +++ E-MODULES-EXTRA/photo/src/photo_picture_local.c (working copy) @@ -149,8 +149,8 @@ int photo_picture_local_load_state_get(void) { - if (pictures_local->thumb.nb || - pictures_local->loader.idler) + if ((pictures_local->thumb.nb) || + (pictures_local->loader.idler)) return 1; return 0; @@ -186,7 +186,7 @@ { DD(("- Search -")); picture = eina_list_data_get(l); - if (!picture->pi && !picture->delete_me && + if ((!picture->pi) && (!picture->delete_me) && (picture->thumb != PICTURE_THUMB_WAITING)) return picture; l = eina_list_next(l); @@ -273,7 +273,7 @@ void photo_picture_local_dir_free(Picture_Local_Dir *dir, int del_dialog) { - if (dir->config_dialog && del_dialog) + if ((dir->config_dialog) && (del_dialog)) photo_config_dialog_dir_hide(dir); eina_stringshare_del(dir->path); free(dir); @@ -379,7 +379,7 @@ pl->loader.odir = opendir((char *)eina_list_data_get(pl->loader.dirs)); /* no more files in the current loader.dirs item */ - if ( !pl->loader.odir || !(fs = readdir(pl->loader.odir)) ) + if ( (!pl->loader.odir) || (!(fs = readdir(pl->loader.odir))) ) { DD(("removing %s", (char *)eina_list_data_get(pl->loader.dirs))); /* go to next dir */ @@ -392,7 +392,7 @@ } if ( (!strcmp(fs->d_name, ".")) || (!strcmp(fs->d_name, "..")) || - (!pl->loader.current_dir->read_hidden && (fs->d_name[0] == '.')) ) + ((!pl->loader.current_dir->read_hidden) && (fs->d_name[0] == '.')) ) return EINA_TRUE; snprintf(file, sizeof(file), @@ -407,7 +407,7 @@ if (stat(file, &fs_stat) < 0) return EINA_FALSE; } - if ( pl->loader.current_dir->recursive && + if ( (pl->loader.current_dir->recursive) && (S_ISDIR(fs_stat.st_mode)) ) { pl->loader.dirs = eina_list_append(pl->loader.dirs, strdup(file)); @@ -450,7 +450,7 @@ /* loading popup message */ nb = eina_list_count(pl->pictures) - pl->pictures_waiting_delete; - if (nb && ((nb == 1) || !(nb%PICTURE_LOCAL_POPUP_LOADER_MOD))) + if ((nb) && ((nb == 1) || (!(nb%PICTURE_LOCAL_POPUP_LOADER_MOD)))) { char buf[50]; @@ -558,7 +558,7 @@ Picture *picture; Picture_Local_List *pl; - if (!photo || !e_module_enabled_get(photo->module)) + if ((!photo) || (!e_module_enabled_get(photo->module))) return; pl = pictures_local; @@ -600,7 +600,7 @@ /* when still thumbnailing after loading */ if ((photo->config->local.popup >= PICTURE_LOCAL_POPUP_SUM) && - !pl->loader.idler) + (!pl->loader.idler)) { if (!pl->thumb.nb) { Index: E-MODULES-EXTRA/photo/src/photo_popup_info.c =================================================================== --- E-MODULES-EXTRA/photo/src/photo_popup_info.c (revision 51690) +++ E-MODULES-EXTRA/photo/src/photo_popup_info.c (working copy) @@ -186,7 +186,7 @@ ew = photo->canvas_w; eh = photo->canvas_h; - if (!pi || (placement == POPUP_INFO_PLACEMENT_CENTERED)) + if ((!pi) || (placement == POPUP_INFO_PLACEMENT_CENTERED)) { POPI_ORIENT_CENTER(); *popi_x = x; Index: E-MODULES-EXTRA/photo/src/photo_config_dialog.c =================================================================== --- E-MODULES-EXTRA/photo/src/photo_config_dialog.c (revision 51690) +++ E-MODULES-EXTRA/photo/src/photo_config_dialog.c (working copy) @@ -405,7 +405,7 @@ cfdata = data; dir = eina_list_nth(photo->config->local.dirs, e_widget_ilist_selected_get(cfdata->ilist_local_dirs)); - if (!dir || (dir->state == PICTURE_LOCAL_DIR_LOADING)) + if ((!dir) || (dir->state == PICTURE_LOCAL_DIR_LOADING)) return; photo->config->local.dirs = eina_list_remove(photo->config->local.dirs, dir); @@ -429,9 +429,9 @@ dir = eina_list_nth(photo->config->local.dirs, e_widget_ilist_selected_get(cfdata->ilist_local_dirs)); - if (!dir || + if ((!dir) || (dir->state == PICTURE_LOCAL_DIR_LOADING) || - dir->config_dialog) + (dir->config_dialog)) return; photo_config_dialog_dir_show(dir); Index: E-MODULES-EXTRA/everything-places/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/everything-places/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/everything-places/src/e_mod_main.c (working copy) @@ -85,7 +85,7 @@ alias++; } uri = efreet_uri_decode(line); - if (!(uri) || !(uri->path)) + if ((!(uri)) || (!(uri->path))) { if (uri) efreet_uri_free(uri); continue; @@ -113,7 +113,7 @@ E_Volume *vol; EINA_LIST_FOREACH(e_fm2_dbus_volume_list_get(), l, vol) { - if (vol->mount_point && !strcmp(vol->mount_point, "/")) + if ((vol->mount_point) && (!strcmp(vol->mount_point, "/"))) continue; it = _item_add(p, vol->label, vol->mount_point, _mime_mount, vol->icon); @@ -186,10 +186,10 @@ E_Volume *vol = it->data; if (!vol) return 0; - if (!vol->mounted && (EVRY_ITEM_DATA_INT_GET(act) == ACT_MOUNT)) + if ((!vol->mounted) && (EVRY_ITEM_DATA_INT_GET(act) == ACT_MOUNT)) return 1; - if (vol->mounted && (EVRY_ITEM_DATA_INT_GET(act) == ACT_UNMOUNT)) + if ((vol->mounted) && (EVRY_ITEM_DATA_INT_GET(act) == ACT_UNMOUNT)) return 1; } @@ -228,14 +228,14 @@ if (!vol) return 0; - if (!vol->mounted && EVRY_ITEM_DATA_INT_GET(act) == ACT_MOUNT) + if ((!vol->mounted) && (EVRY_ITEM_DATA_INT_GET(act) == ACT_MOUNT)) { EVRY_ITEM_REF(it); mount = e_fm2_dbus_mount(vol, _cb_mount_ok, _cb_mount_fail, _cb_mount_ok, _cb_mount_fail, it); /* XXX needs mount to be freed ? */ } - else if (vol->mounted && EVRY_ITEM_DATA_INT_GET(act) == ACT_UNMOUNT) + else if ((vol->mounted) && (EVRY_ITEM_DATA_INT_GET(act) == ACT_UNMOUNT)) { /* if (!(mount = eina_list_data_get(vol->mounts))) */ if (!(mount = e_fm2_dbus_mount_find(vol->mount_point))) Index: E-MODULES-EXTRA/winselector/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/winselector/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/winselector/src/e_mod_main.c (working copy) @@ -627,11 +627,11 @@ } if (((strcmp(class, bd->client.icccm.class) != 0) && - e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE)) + (e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE))) { if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) { - if (subm && mi) + if ((subm) && (mi)) e_menu_item_submenu_set(mi, subm); mi = e_menu_item_new(m); e_menu_item_label_set(mi, bd->client.icccm.class); @@ -652,7 +652,7 @@ } if ((e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) - && subm && mi) + && (subm) && (mi)) e_menu_item_submenu_set(mi, subm); _win_menu_fill_iconified(ico, m); @@ -668,7 +668,7 @@ E_Border *bd; bd = l->data; - if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP) + if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps) && (E_CLIENTLIST_GROUPICONS_SEP)) { ico = eina_list_append(ico, bd); continue; @@ -677,8 +677,8 @@ if (bd->desk != curr_desk) { if ((!bd->iconic) || - (bd->iconic && e_config->clientlist_separate_iconified_apps == - E_CLIENTLIST_GROUPICONS_OWNER)) + ((bd->iconic) && (e_config->clientlist_separate_iconified_apps == + E_CLIENTLIST_GROUPICONS_OWNER))) { alt = eina_list_append(alt, bd); continue; @@ -688,15 +688,15 @@ normal = eina_list_append(normal, bd); } - if (orient == E_GADCON_ORIENT_BOTTOM - || orient == E_GADCON_ORIENT_CORNER_BL - || orient == E_GADCON_ORIENT_CORNER_BR - || orient == E_GADCON_ORIENT_CORNER_RB - || orient == E_GADCON_ORIENT_CORNER_LB) + if ((orient == E_GADCON_ORIENT_BOTTOM) + || (orient == E_GADCON_ORIENT_CORNER_BL) + || (orient == E_GADCON_ORIENT_CORNER_BR) + || (orient == E_GADCON_ORIENT_CORNER_RB) + || (orient == E_GADCON_ORIENT_CORNER_LB)) { if (_win_menu_fill_iconified(ico, m)) _win_menu_fill_separator(m); - if (_win_menu_fill_alt(alt, m) && eina_list_count(normal) > 0) + if ((_win_menu_fill_alt(alt, m)) && (eina_list_count(normal) > 0)) _win_menu_fill_separator(m); _win_menu_fill_normal(normal, m); @@ -705,7 +705,7 @@ { if (_win_menu_fill_normal(normal, m)) _win_menu_fill_separator(m); - if (_win_menu_fill_alt(alt, m) && eina_list_count(ico) > 0) + if ((_win_menu_fill_alt(alt, m)) && (eina_list_count(ico) > 0)) _win_menu_fill_separator(m); _win_menu_fill_iconified(ico, m); @@ -721,7 +721,7 @@ E_Border *bd; bd = l->data; - if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP) + if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps) && (E_CLIENTLIST_GROUPICONS_SEP)) { ico = eina_list_append(ico, bd); continue; @@ -774,12 +774,12 @@ bd = l->data; - if (bd->desk != desk && - e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE) + if ((bd->desk != desk) && + (e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE)) { if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) { - if (subm && mi) + if ((subm) && (mi)) e_menu_item_submenu_set(mi, subm); mi = e_menu_item_new(m); e_menu_item_label_set(mi, bd->desk->name); @@ -802,8 +802,8 @@ else _win_menu_item_create(bd, m); } - if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU - && subm && mi) + if ((e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) + && (subm) && (mi)) e_menu_item_submenu_set(mi, subm); return 1; } Index: E-MODULES-EXTRA/wlan/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/wlan/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/wlan/src/e_mod_main.c (working copy) @@ -437,7 +437,7 @@ /* remove : */ for (; buf[i] != 0; i++) - if (buf[i] == ':' || buf[i] == '.') + if ((buf[i] == ':') || (buf[i] == '.')) buf[i] = ' '; if (sscanf(buf, "%s %u %u %u %u %u %u %u %u %u %u", Index: E-MODULES-EXTRA/iiirk/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/iiirk/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/iiirk/src/e_mod_main.c (working copy) @@ -419,7 +419,7 @@ static void _iiirk_fill(IIirk *b) { - if (b && b->apps && b->inst && b->inst->ci) + if ((b) && (b->apps) && (b->inst) && (b->inst->ci)) { Efreet_Desktop *desktop; Eina_List *l; @@ -1114,12 +1114,12 @@ ic->skip_taskbar = bd->client.netwm.state.skip_taskbar; } - if (bd->desktop && b->apps) + if ((bd->desktop) && (b->apps)) { /* Search for the .desktop in the current list. * If it was not found, append it to the list */ - for (l = b->apps->desktops; l && l->data != bd->desktop; l = l->next); + for (l = b->apps->desktops; (l) && (l->data != bd->desktop); l = l->next); if (!l) e_order_append(b->apps, bd->desktop); } @@ -1172,7 +1172,7 @@ Eina_List *l, *iiirk; ev = event; - if (!ev || !ev->border || !ev->border->desktop) return EINA_TRUE; + if ((!ev) || (!ev->border) || (!ev->border->desktop)) return EINA_TRUE; /* add if the border's desktop icon match one of our list */ desk = e_desk_current_get(ev->border->zone); Index: E-MODULES-EXTRA/places/src/e_mod_places.c =================================================================== --- E-MODULES-EXTRA/places/src/e_mod_places.c (revision 51690) +++ E-MODULES-EXTRA/places/src/e_mod_places.c (working copy) @@ -110,10 +110,10 @@ const Volume *v1 = d1; const Volume *v2 = d2; - if (v1->removable && !v2->removable) return(1); - if (v2->removable && !v1->removable) return(-1); - if(!v1 || !v1->label) return(1); - if(!v2 || !v2->label) return(-1); + if ((v1->removable) && (!v2->removable)) return(1); + if ((v2->removable) && (!v1->removable)) return(-1); + if((!v1) || (!v1->label)) return(1); + if((!v2) || (!v2->label)) return(-1); return strcmp(v1->label, v2->label); } @@ -202,11 +202,11 @@ vol->obj = o; //set volume label - if (vol->label && strlen(vol->label) > 0) + if ((vol->label) && (strlen(vol->label) > 0)) edje_object_part_text_set(o, "volume_label", vol->label); - else if (vol->mount_point && !strcmp(vol->mount_point, "/")) + else if ((vol->mount_point) && (!strcmp(vol->mount_point, "/"))) edje_object_part_text_set(o, "volume_label", D_("Filesystem")); - else if (vol->mount_point && strlen(vol->mount_point) > 0) + else if ((vol->mount_point) && (strlen(vol->mount_point) > 0)) edje_object_part_text_set(o, "volume_label", ecore_file_file_get(vol->mount_point)); else @@ -227,17 +227,17 @@ vol->icon = "modules/places/icon/ms"; else if (!strcmp(vol->model, "iPod")) vol->icon = "modules/places/icon/ipod"; - else if (!strcmp(vol->bus, "usb") && !strcmp(vol->drive_type, "disk")) + else if ((!strcmp(vol->bus, "usb")) && (!strcmp(vol->drive_type, "disk"))) vol->icon = "e/icons/drive-removable-media"; //set partition type tag - if (!strcmp(vol->fstype, "ext2") || !strcmp(vol->fstype, "ext3") || - !strcmp(vol->fstype, "ext4") || !strcmp(vol->fstype, "reiserfs")) + if ((!strcmp(vol->fstype, "ext2")) || (!strcmp(vol->fstype, "ext3")) || + (!strcmp(vol->fstype, "ext4")) || (!strcmp(vol->fstype, "reiserfs"))) edje_object_signal_emit(o, "icon,tag,ext3", "places"); - else if (!strcmp(vol->fstype, "vfat") || !strcmp(vol->fstype, "ntfs") || - !strcmp(vol->fstype, "ntfs-3g")) + else if ((!strcmp(vol->fstype, "vfat")) || (!strcmp(vol->fstype, "ntfs")) || + (!strcmp(vol->fstype, "ntfs-3g"))) edje_object_signal_emit(o, "icon,tag,fat", "places"); - else if (!strcmp(vol->fstype, "hfs") || !strcmp(vol->fstype, "hfsplus")) + else if ((!strcmp(vol->fstype, "hfs")) || (!strcmp(vol->fstype, "hfsplus"))) edje_object_signal_emit(o, "icon,tag,hfs", "places"); else if (!strcmp(vol->fstype, "udf")) edje_object_signal_emit(o, "icon,tag,dvd", "places"); @@ -253,8 +253,8 @@ edje_object_part_swallow(o, "icon", icon); //set mount/eject icon - if (vol->requires_eject || (vol->mounted && strcmp(vol->mount_point, "/")) || - !strcmp(vol->bus, "usb")) //Some usb key don't have requires_eject set (probably an hal error) + if ((vol->requires_eject) || ((vol->mounted) && (strcmp(vol->mount_point, "/"))) || + (!strcmp(vol->bus, "usb"))) //Some usb key don't have requires_eject set (probably an hal error) edje_object_signal_emit(o, "icon,eject,show", "places"); else edje_object_signal_emit(o, "icon,eject,hide", "places"); @@ -342,7 +342,7 @@ alias++; } uri = efreet_uri_decode(line); - if (uri && uri->path) + if ((uri) && (uri->path)) { if (ecore_file_exists(uri->path)) { @@ -419,9 +419,9 @@ } //separator - if (places_conf->show_home || places_conf->show_desk || - places_conf->show_trash || places_conf->show_root || - places_conf->show_temp) + if ((places_conf->show_home) || (places_conf->show_desk) || + (places_conf->show_trash) || (places_conf->show_root) || + (places_conf->show_temp)) { mi = e_menu_item_new(em); e_menu_item_separator_set(mi, 1); @@ -434,7 +434,7 @@ EINA_LIST_FOREACH(volumes, l, vol) { if (!vol->valid) continue; - if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue; + if ((vol->mount_point) && (!strcmp(vol->mount_point, "/"))) continue; mi = e_menu_item_new(em); if ((vol->label) && (vol->label[0] != '\0')) @@ -493,7 +493,7 @@ Volume *vol; EINA_LIST_FOREACH(volumes, l, vol) - if (vol->valid && vol->mounted) + if ((vol->valid) && (vol->mounted)) _places_update_size(vol->obj, vol); return EINA_TRUE; @@ -637,7 +637,7 @@ { const char *directory = data; - if (places_conf->fm && (places_conf->fm[0] != '\0')) + if ((places_conf->fm) && (places_conf->fm[0] != '\0')) { _places_run_fm_external(places_conf->fm, directory); return; @@ -646,7 +646,7 @@ E_Action *act = e_action_find("fileman"); Eina_List *managers = e_manager_list(); - if (act && act->func.go && managers && managers->data) + if ((act) && (act->func.go) && (managers) && (managers->data)) act->func.go(E_OBJECT(managers->data), directory); else _places_run_fm_external("thunar", directory); @@ -869,7 +869,7 @@ Eina_List *l; char *udi; - if (!ret || !ret->strings) return; + if ((!ret) || (!ret->strings)) return; if (dbus_error_is_set(error)) { @@ -892,7 +892,7 @@ char *udi = user_data; E_Hal_Device_Query_Capability_Return *ret = reply_data; - if (ret && ret->boolean) + if ((ret) && (ret->boolean)) { //~ printf("PLACES DBUS CB UDI:%s\n", udi); _places_volume_add(udi); @@ -911,12 +911,12 @@ const char *str = NULL; /* skip volumes with volume.ignore set */ - if (e_hal_property_bool_get(reply, "volume.ignore", &err) || err) + if ((e_hal_property_bool_get(reply, "volume.ignore", &err)) || (err)) return; /* skip volumes that aren't filesystems */ str = e_hal_property_string_get(reply, "volume.fsusage", &err); - if (err || !str || strcmp(str, "filesystem")) + if ((err) || (!str) || (strcmp(str, "filesystem"))) return; //~ v->uuid = e_hal_property_string_get(ret, "volume.uuid", &err); //~ if (err) goto error; @@ -944,7 +944,7 @@ //~ } str = e_hal_property_string_get(reply, "info.parent", &err); - if (!err && str) + if ((!err) && (str)) { e_hal_device_get_all_properties(conn, str, _places_storage_properties_cb, v); @@ -1003,7 +1003,7 @@ //_places_print_volume(v); //Use this for debug v->valid = 1; - if (v->to_mount && !v->mounted) + if ((v->to_mount) && (!v->mounted)) { Eina_Bool enabled; Index: E-MODULES-EXTRA/calendar/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/calendar/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/calendar/src/e_mod_main.c (working copy) @@ -379,7 +379,7 @@ month = time->tm_mon; year = time->tm_year + 1900; - maxdays = days_in_month[(!(year % 4) && (!(year % 400) || (year % 100)))] + maxdays = days_in_month[((!(year % 4)) && ((!(year % 400)) || (year % 100)))] [month]; current_time = mktime(time); @@ -416,14 +416,14 @@ if (!day) if (col == startwd) day = 1; cday = day; - if (day && (day <= maxdays)) + if ((day) && (day <= maxdays)) snprintf(buf, sizeof(buf), "%02d", day++); else buf[0] = 0; - if (cday == inst->current_time.tm_mday - && month == inst->current_time.tm_mon - && time->tm_year == inst->current_time.tm_year) + if ((cday == inst->current_time.tm_mday) + && (month == inst->current_time.tm_mon) + && (time->tm_year == inst->current_time.tm_year)) { o = inst->calendar->o_today = edje_object_add(evas); @@ -524,7 +524,7 @@ if (!inst->popup) continue; evas_object_geometry_get(inst->calendar->o_icon, NULL, NULL, &w, &h); - if (w == 0 || h == 0) continue ; + if ((w == 0) || (h == 0)) continue ; if (inst->popup->win->visible) { Index: E-MODULES-EXTRA/itask/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/itask/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/itask/src/e_mod_main.c (working copy) @@ -438,7 +438,7 @@ } int i; - for(i = 0; items - items_on_desk_in_bar >= i && i < items_on_desk_in_menu ; i++) + for(i = 0; (items - items_on_desk_in_bar >= i) && (i < items_on_desk_in_menu) ; i++) { ic = l_items->data; for(lll = l_items->next; lll ; lll = lll->next) Index: E-MODULES-EXTRA/itask/src/itask_item.c =================================================================== --- E-MODULES-EXTRA/itask/src/itask_item.c (revision 51690) +++ E-MODULES-EXTRA/itask/src/itask_item.c (working copy) @@ -28,7 +28,7 @@ Eina_List *l; ic->in_bar = 1; Itask_Item *l_ic = NULL; - if(it->num_items == 0 && it->hide_menu_button){ + if((it->num_items == 0) && (it->hide_menu_button)){ itask_menu_button(it); } it->num_items++; @@ -89,8 +89,8 @@ for(l = it->items_bar; l; l = l->next) { l_ic = l->data; - if(l_ic->border->client.icccm.class - && !strcmp(l_ic->border->client.icccm.class,ic->border->client.icccm.class)) + if((l_ic->border->client.icccm.class) + && (!strcmp(l_ic->border->client.icccm.class,ic->border->client.icccm.class))) break; l_ic = NULL; } @@ -123,7 +123,7 @@ { Itask *it = ic->itask; it->num_items--; - if(it->num_items == 0 && it->hide_menu_button){ + if((it->num_items == 0) && (it->hide_menu_button)){ itask_menu_remove(it); } ic->in_bar = 0; @@ -148,7 +148,7 @@ Itask_Item *ic, *l_ic; Eina_List *l; Eina_List *group = NULL; - if(!itask_item_add_check(it, bd) || _itask_item_find(it, bd)) + if((!itask_item_add_check(it, bd)) || (_itask_item_find(it, bd))) return NULL; ic = E_NEW(Itask_Item, 1); @@ -198,8 +198,8 @@ for(l = it->items_bar; l; l = l->next) { l_ic = l->data; - if(l_ic->border->client.icccm.class - && !strcmp(l_ic->border->client.icccm.class,ic->border->client.icccm.class)) + if((l_ic->border->client.icccm.class) + && (!strcmp(l_ic->border->client.icccm.class,ic->border->client.icccm.class))) { itask_item_remove_from_bar(l_ic); break; @@ -605,7 +605,7 @@ bl = e_container_border_list_last(ic->border->zone->container); while ((bd = e_container_border_list_next(bl))) { - if (bd->new_client + if ((bd->new_client) || ((bd->desk != current_desk) && (!bd->sticky)) || (bd->iconic) || (bd->layer == 150)) continue; // TODO there is probably more stuff to filter out @@ -623,7 +623,7 @@ e_border_iconify(ic->border); else { - if(e_desk_current_get(ic->border->zone) != ic->border->desk && !ic->border->sticky) + if((e_desk_current_get(ic->border->zone) != ic->border->desk) && (!ic->border->sticky)) e_desk_show(ic->border->desk); if(ic->border->shaded) @@ -756,8 +756,8 @@ EAPI int itask_item_add_check(Itask *it, E_Border *bd) { - if((it->skip_dialogs && bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG) - || (it->skip_always_below_windows && bd->layer == 50) + if(((it->skip_dialogs) && (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)) + || ((it->skip_always_below_windows) && (bd->layer == 50)) || (bd->user_skip_winlist) || (bd->client.netwm.state.skip_taskbar) || ((it->show_zone) && (bd->zone != it->zone)) @@ -783,7 +783,7 @@ for(l = list->next; l ; l = l->next) { ic2 = l->data; - if(ic2 && ic2->last_time < ic->last_time) + if((ic2) && (ic2->last_time < ic->last_time)) ic = ic2; } return ic; @@ -804,7 +804,7 @@ for(l = list->next; l ; l = l->next) { ic2 = l->data; - if(ic2 && ic2->last_time > ic->last_time) + if((ic2) && (ic2->last_time > ic->last_time)) ic = ic2; } return ic; Index: E-MODULES-EXTRA/itask/src/itask_border_menu.c =================================================================== --- E-MODULES-EXTRA/itask/src/itask_border_menu.c (revision 51690) +++ E-MODULES-EXTRA/itask/src/itask_border_menu.c (working copy) @@ -103,7 +103,7 @@ } - if (!bd->lock_user_sticky && !bd->fullscreen) // sticky with fullscreen doesnt work correct + if ((!bd->lock_user_sticky) && (!bd->fullscreen)) // sticky with fullscreen doesnt work correct { mi = e_menu_item_new(mn); e_menu_item_label_set(mi, N_("Sticky")); Index: E-MODULES-EXTRA/itask/src/itask_items.c =================================================================== --- E-MODULES-EXTRA/itask/src/itask_items.c (revision 51690) +++ E-MODULES-EXTRA/itask/src/itask_items.c (working copy) @@ -272,16 +272,16 @@ remove = 1; //ic = _itask_items_find_item(it, bd); - if (!ic && !remove) + if ((!ic) && (!remove)) { itask_item_new(it, bd); continue; } - else if (!ic && remove) + else if ((!ic) && (remove)) { continue; } - else if (ic && remove) + else if ((ic) && (remove)) { it->items = eina_list_remove(it->items, ic); itask_item_remove(ic); @@ -403,11 +403,11 @@ } if (it->show_zone != 0) { - if(it->zone == ev->zone && (ic = itask_item_new(it, bd))) + if((it->zone == ev->zone) && (ic = itask_item_new(it, bd))) { if(ic) itask_item_realize(ic); } - if(it->zone != ev->zone && (ic = _itask_items_find_item(it, ev->border))) + if((it->zone != ev->zone) && (ic = _itask_items_find_item(it, ev->border))) { itask_item_remove(ic); itask_item_swap_youngest_from_menu(it); Index: E-MODULES-EXTRA/everything-mpris/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/everything-mpris/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/everything-mpris/src/e_mod_main.c (working copy) @@ -102,7 +102,7 @@ static int _dbus_check_msg(DBusMessage *reply, DBusError *error) { - if (error && dbus_error_is_set(error)) + if ((error) && (dbus_error_is_set(error))) { DBG("Error: %s - %s\n", error->name, error->message); return 0; @@ -207,7 +207,7 @@ EVRY_PLUGIN_ITEMS_CLEAR(p); /* remove 'empty' item */ - if ((p->tracks && p->tracks->next) && + if ((p->tracks && (p->tracks->next)) && (p->tracks->data == p->empty)) p->tracks = eina_list_remove(p->tracks, p->empty); @@ -225,7 +225,7 @@ continue; } - if (t2 && (t->id == t2->id) && (EVRY_ITEM(t)->id == EVRY_ITEM(t2)->id)) + if ((t2) && (t->id == t2->id) && (EVRY_ITEM(t)->id == EVRY_ITEM(t2)->id)) { EVRY_ITEM_FREE(t); p->tracks = eina_list_append(p->tracks, t2); @@ -247,7 +247,7 @@ free(tmp); /*** set label ***/ - if (t->artist && t->title) + if ((t->artist) && (t->title)) { snprintf(buf, sizeof(buf), "%s - %s", t->artist, t->title); it->label = eina_stringshare_add(buf); @@ -279,7 +279,7 @@ EINA_LIST_FOREACH(p->tracks, l, t) { - if ((!p->input || evry->fuzzy_match(EVRY_ITEM(t)->label, p->input))) + if (((!p->input) || (evry->fuzzy_match(EVRY_ITEM(t)->label, p->input)))) EVRY_PLUGIN_ITEM_APPEND(p, t); } @@ -349,28 +349,28 @@ { dbus_message_iter_recurse (&iter, &iter_val); dbus_message_iter_get_basic (&iter_val, &tmp); - if (tmp && tmp[0]) + if ((tmp) && (tmp[0])) t->artist = eina_stringshare_add(tmp); } else if (!strcmp(key, "title")) { dbus_message_iter_recurse (&iter, &iter_val); dbus_message_iter_get_basic (&iter_val, &tmp); - if (tmp && tmp[0]) + if ((tmp) && (tmp[0])) t->title = eina_stringshare_add(tmp); } else if (!strcmp(key, "location")) { dbus_message_iter_recurse (&iter, &iter_val); dbus_message_iter_get_basic (&iter_val, &tmp); - if (tmp && tmp[0]) + if ((tmp) && (tmp[0])) EVRY_ITEM(t)->id = eina_stringshare_add(tmp); } else if (!strcmp(key, "album")) { dbus_message_iter_recurse (&iter, &iter_val); dbus_message_iter_get_basic (&iter_val, &tmp); - if (tmp && tmp[0]) + if ((tmp) && (tmp[0])) t->album = eina_stringshare_add(tmp); } else if (!strcmp(key, "mtime")) @@ -616,7 +616,7 @@ static Evry_Plugin * _begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__) { - if (!conn || !dbus_active) return NULL; + if ((!conn) || (!dbus_active)) return NULL; GET_PLUGIN(p, plugin); @@ -704,7 +704,7 @@ EINA_LIST_FOREACH(p->tracks, l, t) { - if (!input || evry->fuzzy_match(EVRY_ITEM(t)->label, input)) + if ((!input) || (evry->fuzzy_match(EVRY_ITEM(t)->label, input))) EVRY_PLUGIN_ITEM_APPEND(p, t); } @@ -720,8 +720,8 @@ GET_TRACK(t, act->it1.item); GET_PLUGIN(p, EVRY_ITEM(t)->plugin); - if (!strcmp(bus_name, "org.mpris.amarok") || - !strcmp(bus_name, "org.mpris.xmms2")) + if ((!strcmp(bus_name, "org.mpris.amarok")) || + (!strcmp(bus_name, "org.mpris.xmms2"))) { _dbus_send_msg_int("/TrackList", "PlayTrack", NULL, NULL, t->id); return 1; @@ -931,7 +931,7 @@ e_dbus_message_send(conn, msg, NULL, -1, NULL); dbus_message_unref(msg); - if (play_now && _plug->status.playing != 0) + if ((play_now) && (_plug->status.playing != 0)) _dbus_send_msg("/Player", "Play", NULL, NULL); free(buf); @@ -950,7 +950,7 @@ snprintf(buf, sizeof(buf), "%s/%s", path, f); mime = efreet_mime_type_get(buf); - if (mime && strncmp(mime, "audio/", 6) == 0) + if ((mime) && (strncmp(mime, "audio/", 6) == 0)) _add_file(buf, 0); free(f); @@ -960,7 +960,7 @@ static int _add_files(Evry_Item_File *file) { - if (file->mime && strncmp(file->mime, "audio/", 6) == 0) + if ((file->mime) && (strncmp(file->mime, "audio/", 6) == 0)) { _add_file(file->path, 0); return 1; @@ -1009,8 +1009,8 @@ (!CHECK_TYPE(it, TRACKER_MUSIC))) return 0; - if (CHECK_TYPE(it, TRACKER_MUSIC) && - CHECK_SUBTYPE(it, FILE_LIST) && + if ((CHECK_TYPE(it, TRACKER_MUSIC)) && + (CHECK_SUBTYPE(it, FILE_LIST)) && (act->it2.item->data)) { char *file; @@ -1082,7 +1082,7 @@ { GET_FILE(file, it); - return (file->mime && !strncmp(file->mime, "audio/", 6)); + return ((file->mime) && (!strncmp(file->mime, "audio/", 6))); } static int @@ -1090,7 +1090,7 @@ { GET_FILE(file, it); - return ((it->browseable) || (file->mime && !strncmp(file->mime, "audio/", 6))); + return ((it->browseable) || ((file->mime) && (!strncmp(file->mime, "audio/", 6)))); } static int @@ -1146,9 +1146,9 @@ } else if (action == ACT_CLEAR) { - if (strcmp(bus_name, "org.mpris.xmms2") && - strcmp(bus_name, "org.mpris.audacious") && - strcmp(bus_name, "org.mpris.corn")) + if ((strcmp(bus_name, "org.mpris.xmms2")) && + (strcmp(bus_name, "org.mpris.audacious")) && + (strcmp(bus_name, "org.mpris.corn"))) return 0; } Index: E-MODULES-EXTRA/itask-ng/src/ng_item.c =================================================================== --- E-MODULES-EXTRA/itask-ng/src/ng_item.c (revision 51690) +++ E-MODULES-EXTRA/itask-ng/src/ng_item.c (working copy) @@ -100,7 +100,7 @@ if (it->overlay_signal_timer) ecore_timer_del(it->overlay_signal_timer); - if (it->box && it->box->ng) + if ((it->box) && (it->box->ng)) { if (it->box->ng->item_active) it->box->ng->item_active = NULL; Index: E-MODULES-EXTRA/itask-ng/src/ng_launcher.c =================================================================== --- E-MODULES-EXTRA/itask-ng/src/ng_launcher.c (revision 51690) +++ E-MODULES-EXTRA/itask-ng/src/ng_launcher.c (working copy) @@ -44,7 +44,7 @@ _ngi_launcher_cb_drop_leave, _ngi_launcher_cb_drop_end, drop, 3, 0, 0, 0, 0); - if (!cfg->launcher_app_dir || strlen(cfg->launcher_app_dir) == 0) return; + if ((!cfg->launcher_app_dir) || (strlen(cfg->launcher_app_dir) == 0)) return; if (cfg->launcher_app_dir[0] != '/') { @@ -102,7 +102,7 @@ if (!box->apps) return; EINA_LIST_FOREACH(box->items, items, it) - if (!it->app || !it->usable) return; + if ((!it->app) || (!it->usable)) return; /* apps = box->apps->desktops; * items = box->items; @@ -209,7 +209,7 @@ else /* border || desktop */ { it = ngi_box_item_at_position_get(box); - if (it && it->border) it = NULL; + if ((it) && (it->border)) it = NULL; box->item_drop = ngi_item_new(box); ngi_box_item_show(box->ng, box->item_drop, 1); @@ -250,10 +250,10 @@ else { l = eina_list_data_find_list(box->items, box->item_drop); - if (l && l->next) + if ((l) && (l->next)) next = (Ngi_Item*)l->next->data; - if (it != box->item_drop && (!next || it != next)) + if ((it != box->item_drop) && ((!next) || (it != next))) { box->items = eina_list_remove(box->items, box->item_drop); @@ -343,13 +343,13 @@ for(l = box->items; l; l = l->next) { - if (box->item_drop == l->data && l->next && l->next->data) + if ((box->item_drop == l->data) && (l->next) && (l->next->data)) { it2 = (Ngi_Item*) l->next->data; } } - if (it2 && it2->app && app) + if ((it2) && (it2->app) && (app)) { e_order_prepend_relative(box->apps, app, it2->app); } @@ -368,7 +368,7 @@ app = efreet_desktop_get(strdup(file)); - if (it2 && it2->app && app) + if ((it2) && (it2->app) && (app)) { e_order_prepend_relative(box->apps, app, it2->app); } @@ -578,7 +578,7 @@ app = it->app; - if (ev->buttons == 3 && app) + if ((ev->buttons == 3) && (app)) { evas_object_geometry_get(it->obj, &x, &y, &w, &h); Index: E-MODULES-EXTRA/itask-ng/src/e_mod_main.c =================================================================== --- E-MODULES-EXTRA/itask-ng/src/e_mod_main.c (revision 51690) +++ E-MODULES-EXTRA/itask-ng/src/e_mod_main.c (working copy) @@ -449,7 +449,7 @@ ngi_config->theme_path = strdup(buf); snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/", e_user_homedir_get()); - if (!ecore_file_mkdir(buf) && !ecore_file_is_dir(buf)) + if ((!ecore_file_mkdir(buf)) && (!ecore_file_is_dir(buf))) { e_error_message_show("Error creating directory:\n %s\n",buf); return m; @@ -470,7 +470,7 @@ ngi_taskbar_init(); ngi_gadcon_init(); - if (ecore_x_screen_is_composited(0) || e_config->use_composite) + if ((ecore_x_screen_is_composited(0)) || (e_config->use_composite)) ngi_config->use_composite = 1; else ngi_config->use_composite = 0; @@ -522,7 +522,7 @@ EINA_LIST_FOREACH (ci->boxes, l, cfg_box) { - if (cfg_box->type == launcher && cfg_box->launcher_app_dir) + if ((cfg_box->type == launcher) && (cfg_box->launcher_app_dir)) eina_stringshare_del(cfg_box->launcher_app_dir); if (cfg_box->type == gadcon) @@ -808,7 +808,7 @@ if (!ng->mouse_in) return EINA_FALSE; - if (ng->cfg->autohide && ng->hide_state != show) + if ((ng->cfg->autohide) && (ng->hide_state != show)) _ngi_autohide(ng, 0); if (ng->cfg->stacking != on_desk) @@ -903,7 +903,7 @@ Ecore_X_Event_Mouse_In *ev = event; Ng *ng = data; - if (ev->win != ng->win->input && ev->win != ng->win->edge) + if ((ev->win != ng->win->input) && (ev->win != ng->win->edge)) return EINA_TRUE; ng->pos = ng->horizontal ? @@ -924,7 +924,7 @@ Ecore_X_Event_Mouse_Out *ev = event; Ng *ng = data; - if (ev->win != ng->win->input && ev->win != ng->win->edge) + if ((ev->win != ng->win->input) && (ev->win != ng->win->edge)) return EINA_TRUE; ngi_mouse_out(ng); @@ -977,7 +977,7 @@ ngi_configure_module(ng->cfg); return EINA_TRUE; } - else if (ng->item_active && ev->buttons == 1) + else if ((ng->item_active) && (ev->buttons == 1)) { it->drag.x = ev->root.x; it->drag.y = ev->root.y; @@ -1067,7 +1067,7 @@ if (ng->pos != pos) { - if (pos >= ng->start && pos < ng->start + ng->w) + if ((pos >= ng->start) && (pos < ng->start + ng->w)) { evas_event_feed_mouse_move (ng->win->evas, @@ -1186,10 +1186,10 @@ int hidden = 0; - if (ng->hide_state == hiding || ng->hide_state == hidden) + if ((ng->hide_state == hiding) || (ng->hide_state == hidden)) hidden = ng->size + 15; - if (ng->state != unzoomed && !ng->zoom_out) + if ((ng->state != unzoomed) && (!ng->zoom_out)) { item_zoomed = _ngi_zoom_function2(ng); } @@ -1245,7 +1245,7 @@ break; } - if (win->edge && resize) + if ((win->edge) && (resize)) { ecore_x_window_move_resize(win->edge, wx, wy, ww, wh); e_drop_handler_geometry_set(win->drop_handler, wx, wy, ww, wh); @@ -1257,7 +1257,7 @@ ng->zone->y + win->y + y, w, h); - if (ngi_config->use_composite && win->ee) + if ((ngi_config->use_composite) && (win->ee)) { XRectangle rect; rect.x = rect.y = 0; @@ -1363,21 +1363,21 @@ { Ngi_Item *it = _ngi_item_at_position_get(ng); - if (it && ng->cfg->zoom_one) ng->pos = it->pos; + if ((it) && (ng->cfg->zoom_one)) ng->pos = it->pos; - if (ng->mouse_in && it && it != ng->item_active) + if ((ng->mouse_in) && (it) && (it != ng->item_active)) { ITEM_MOUSE_OUT(ng->item_active); ITEM_MOUSE_IN(it); ng->item_active = it; } - else if (!it || ng->zoom_out) + else if ((!it) || (ng->zoom_out)) { ITEM_MOUSE_OUT(ng->item_active); ng->item_active = NULL; /*XXX TEST*/ } - if (ng->item_active && ng->cfg->show_label) + if ((ng->item_active) && (ng->cfg->show_label)) { /* XXX this duplicates code from ngi_redraw */ int h, size; @@ -1403,7 +1403,7 @@ (size + 12 + TEXT_DIST) - ng->hide_step); } - if (ng->item_active->label && ng->item_active->label[0]) + if ((ng->item_active->label) && (ng->item_active->label[0])) { evas_object_show(ng->label); edje_object_signal_emit(ng->label, "e,state,label_show", "e"); @@ -1645,8 +1645,8 @@ if (ng->cfg->autohide) { - if (ng->mouse_in || ng->show_bar || ng->menu_wait_timer || - (ng->cfg->autohide == AUTOHIDE_FULLSCREEN && !ng->hide_fullscreen)) + if ((ng->mouse_in) || (ng->show_bar) || (ng->menu_wait_timer) || + ((ng->cfg->autohide == AUTOHIDE_FULLSCREEN) && (!ng->hide_fullscreen))) { if (ng->hide_state != show) { @@ -1717,7 +1717,7 @@ int end = (int)(middle + disp); /* shrink bar when it becomes larger than screen height/width */ - if (end < 0 && size > 1) + if ((end < 0) && (size > 1)) { ng->size -=1; ngi_reposition(ng); @@ -1810,7 +1810,7 @@ double z = cfg->zoomfactor * (double)ng->size; double w = range * (double)ng->size; - if (d > -range && d < range) + if ((d > -range) && (d < range)) { *zoom = (ng->zoom - 1.0) * (cfg->zoomfactor - 1.0) * ((sqrt_ff_1 - sqrt_ffxx) / (sqrt_ff_1 - f)) + 1.0; @@ -1950,7 +1950,7 @@ } } - if (ng->item_active && ng->state != unzoomed) + if ((ng->item_active) && (ng->state != unzoomed)) { if (cfg->zoomfactor > 1.0) { @@ -2116,7 +2116,7 @@ void ngi_bar_show(Ng *ng) { - if (ng->boxes && !evas_object_visible_get(ng->clip)) + if ((ng->boxes) && (!evas_object_visible_get(ng->clip))) evas_object_show(ng->clip); } Index: E-MODULES-EXTRA/itask-ng/src/ng_config.c =================================================================== --- E-MODULES-EXTRA/itask-ng/src/ng_config.c (revision 51690) +++ E-MODULES-EXTRA/itask-ng/src/ng_config.c (working copy) @@ -803,7 +803,7 @@ Eina_List *l = eina_list_nth_list(boxes, selected); - if (!l || !l->prev) return; + if ((!l) || (!l->prev)) return; Config_Box *cfg_box = l->data; @@ -829,7 +829,7 @@ Eina_List *l = eina_list_nth_list(boxes, selected); - if (!l || !l->next) return; + if ((!l) || (!l->next)) return; Config_Box *cfg_box = l->data; Index: E-MODULES-EXTRA/itask-ng/src/ng_taskbar.c =================================================================== --- E-MODULES-EXTRA/itask-ng/src/ng_taskbar.c (revision 51690) +++ E-MODULES-EXTRA/itask-ng/src/ng_taskbar.c (working copy) @@ -117,21 +117,21 @@ static int _ngi_taskbar_border_check(Ngi_Box *box, E_Border *bd) { - if (box->cfg->taskbar_show_desktop && bd->desk != e_desk_current_get(box->ng->zone)) return 0; + if ((box->cfg->taskbar_show_desktop) && (bd->desk != e_desk_current_get(box->ng->zone))) return 0; - if (box->cfg->taskbar_show_iconified == 0 && bd->iconic) return 0; + if ((box->cfg->taskbar_show_iconified == 0) && (bd->iconic)) return 0; - if (box->cfg->taskbar_show_iconified == 2 && !bd->iconic) return 0; + if ((box->cfg->taskbar_show_iconified == 2) && (!bd->iconic)) return 0; - if ((box->cfg->taskbar_skip_dialogs && bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG) + if (((box->cfg->taskbar_skip_dialogs) && (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)) || (bd->user_skip_winlist) || (bd->client.netwm.state.skip_taskbar)) return 0; /* XXX Xitk menu windows act like normal windows... */ - if (bd->client.icccm.transient_for && - bd->client.icccm.class && - !strcmp(bd->client.icccm.class, "Xitk")) return 0; + if ((bd->client.icccm.transient_for) && + (bd->client.icccm.class) && + (!strcmp(bd->client.icccm.class, "Xitk"))) return 0; return 1; } @@ -206,7 +206,7 @@ it = ngi_box_item_at_position_get(box); - if (!it || !ng->item_active) return; + if ((!it) || (!ng->item_active)) return; if (ng->item_active != it) { @@ -251,7 +251,7 @@ desk = e_desk_current_get(it->border->zone); - if (desk != it->border->desk && !it->border->sticky) + if ((desk != it->border->desk) && (!it->border->sticky)) { e_desk_show(it->border->desk); } @@ -310,7 +310,7 @@ else if (type == E_EVENT_BORDER_FOCUS_OUT) { if (!it) continue; - if (it->border->iconic && box->cfg->taskbar_show_iconified != 2) + if ((it->border->iconic) && (box->cfg->taskbar_show_iconified != 2)) ngi_item_signal_emit(it, "e,state,taskbar_item_iconify"); else ngi_item_signal_emit(it, "e,state,taskbar_item_normal"); @@ -375,7 +375,7 @@ else { it->urgent = 0; - if (it->border->iconic && box->cfg->taskbar_show_iconified != 2) + if ((it->border->iconic) && (box->cfg->taskbar_show_iconified != 2)) ngi_item_signal_emit(it, "e,state,taskbar_item_iconify"); else if (bd->focused) ngi_item_signal_emit(it, "e,state,taskbar_item_focused"); @@ -395,7 +395,7 @@ */ if (bd->already_unparented) return EINA_TRUE; - if (it && it->usable) + if ((it) && (it->usable)) { if (!_ngi_taskbar_border_check(box, bd)) ngi_item_remove(it); @@ -427,7 +427,7 @@ { EINA_LIST_FOREACH (ng->boxes, ll, box) { - if (box->cfg->type != taskbar || !box->cfg->taskbar_show_desktop) + if ((box->cfg->type != taskbar) || (!box->cfg->taskbar_show_desktop)) continue; desk = e_desk_current_get(ng->zone); @@ -481,7 +481,7 @@ _ngi_taskbar_item_set_label(it); if (box->cfg->taskbar_group_apps) - if (bd->client.icccm.class && bd->client.icccm.class[0]) + if ((bd->client.icccm.class) && (bd->client.icccm.class[0])) { it->class = eina_stringshare_add(bd->client.icccm.class); @@ -489,13 +489,13 @@ { if (box->cfg->taskbar_append_right) { - if (ll_it && l_it->class && ll_it->class && - ll_it->class == it->class && - l_it->class != it->class) break; + if ((ll_it) && (l_it->class) && (ll_it->class) && + (ll_it->class == it->class) && + (l_it->class != it->class)) break; } else { - if (l_it->class && l_it->class == it->class) break; + if ((l_it->class) && (l_it->class == it->class)) break; ll_it = l_it; l_it = NULL; } @@ -522,7 +522,7 @@ ngi_box_item_show(ng, it, 0); - if (!bd->iconic || box->cfg->taskbar_show_iconified == 2) + if ((!bd->iconic) || (box->cfg->taskbar_show_iconified == 2)) ngi_item_signal_emit(it, "e,state,taskbar_item_normal"); } @@ -657,7 +657,7 @@ evas_object_pass_events_set(it->o_icon2, 1); evas_object_show(it->o_icon2); - if (it->border->iconic && it->box->cfg->taskbar_show_iconified != 2) + if ((it->border->iconic) && (it->box->cfg->taskbar_show_iconified != 2)) ngi_item_signal_emit(it, "e,state,taskbar_item_iconify"); } @@ -732,7 +732,7 @@ ng = it->box->ng; bd = it->border; - if (ev->buttons == 3 && bd) + if ((ev->buttons == 3) && (bd)) { int dir = E_MENU_POP_DIRECTION_AUTO; evas_object_geometry_get(it->obj, &x, &y, &w, &h); @@ -764,7 +764,7 @@ } ngi_border_menu_show(it->box, it->border, x, y, dir, ev->timestamp); } - else if (ev->buttons == 1 && ev->double_click && !it->border->iconic) + else if ((ev->buttons == 1) && (ev->double_click) && (!it->border->iconic)) { e_border_iconify(it->border); } @@ -782,7 +782,7 @@ { desk = e_desk_current_get(it->border->zone); - if (desk != it->border->desk && !it->border->sticky) + if ((desk != it->border->desk) && (!it->border->sticky)) { e_desk_show(it->border->desk); } @@ -824,7 +824,7 @@ { it->urgent = 0; - if (it->border->iconic && it->box->cfg->taskbar_show_iconified != 2) + if ((it->border->iconic) && (it->box->cfg->taskbar_show_iconified != 2)) ngi_item_signal_emit(it, "e,state,taskbar_item_iconify"); else if (it->border->focused) ngi_item_signal_emit(it, "e,state,taskbar_item_focused"); Index: E-MODULES-EXTRA/itask-ng/src/ng_box.c =================================================================== --- E-MODULES-EXTRA/itask-ng/src/ng_box.c (revision 51690) +++ E-MODULES-EXTRA/itask-ng/src/ng_box.c (working copy) @@ -28,7 +28,7 @@ const char *clip_to = edje_object_data_get(box->separator, "clip_to_background"); - if (clip_to && atoi(clip_to)) + if ((clip_to) && (atoi(clip_to))) evas_object_clip_set(box->separator, ng->bg_clip); if (ng->separator_width == 0) @@ -84,7 +84,7 @@ ng->changed = 1; - if (ng->state != hidden || !ng->cfg->autohide) + if ((ng->state != hidden) || (!ng->cfg->autohide)) ngi_bar_show(ng); //evas_object_show(ng->clip); Index: eterm/Eterm/src/buttons.c =================================================================== --- eterm/Eterm/src/buttons.c (revision 51690) +++ eterm/Eterm/src/buttons.c (working copy) @@ -67,7 +67,7 @@ REQUIRE(gc != None); #ifdef MULTI_CHARSET - if (bbar->fontset && encoding_method != LATIN1) + if ((bbar->fontset) && (encoding_method != LATIN1)) XmbDrawString(Xdisplay, d, bbar->fontset, gc, x, y, str, len); else #endif @@ -260,14 +260,14 @@ D_EVENTS(("bbar_handle_button_release(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window)); #ifdef ESCREEN - if (drag && TermWin.screen && TermWin.screen->backend && TermWin.screen->userdef) { + if ((drag) && (TermWin.screen) && (TermWin.screen->backend) && (TermWin.screen->userdef)) { buttonbar_t *bbar = (buttonbar_t *) TermWin.screen->userdef; button_t *b; int fm = 0, to = 0; D_ESCREEN(("Checking for dragged button.\n")); - if (bbar && (b = bbar->buttons) && (drag != bbar->current)) { - while (b && (b != drag)) { + if ((bbar) && (b = bbar->buttons) && (drag != bbar->current)) { + while ((b) && (b != drag)) { b = b->next; fm++; } @@ -278,7 +278,7 @@ if (bbar->current) { b = bbar->buttons; - while (b && (b != bbar->current)) { + while ((b) && (b != bbar->current)) { b = b->next; to++; } @@ -337,7 +337,7 @@ b = find_button_by_coords(bbar, ev->xbutton.x, ev->xbutton.y); if (b) { D_EVENTS(("Event in buttonbar %8p, button %8p (%s)\n", bbar, b, NONULL(b->text))); - if (bbar->current && (b != bbar->current)) { + if ((bbar->current) && (b != bbar->current)) { D_EVENTS(("Current button %8p (%s) doesn't match event button %8p (%s)\n", bbar->current, NONULL(bbar->current->text), b, NONULL(b->text))); bbar_deselect_button(bbar, bbar->current); @@ -770,7 +770,7 @@ if (button->text) { FREE(button->text); } - if (button->type == ACTION_STRING || button->type == ACTION_ECHO) { + if ((button->type == ACTION_STRING) || (button->type == ACTION_ECHO)) { FREE(button->action.string); } if (button->icon) { @@ -931,18 +931,18 @@ size_t len; #ifdef ESCREEN - if (TermWin.screen && TermWin.screen->backend) { /* translate escapes */ + if ((TermWin.screen) && (TermWin.screen->backend)) { /* translate escapes */ button_t *b = bbar->buttons; _ns_disp *d2 = TermWin.screen->dsps; int n = (button->action.string)[1] - '0'; - if (b && (b->flags & NS_SCREAM_BUTTON)) { + if ((b) && (b->flags & NS_SCREAM_BUTTON)) { D_ESCREEN(("Looking for active display, n == %d, press == %d, prvs == %d\n", n, (int) press, (int) prvs)); if (prvs != 1) { /* find active disp */ - for (; b && !(b->flags & NS_SCREAM_CURR); b = b->next); + for (; (b) && (!(b->flags & NS_SCREAM_CURR)); b = b->next); - if (b && b != button) { + if ((b) && (b != button)) { D_ESCREEN((" -> Found button %8p (%s) for current display.\n", b, NONULL(b->text))); /* when trying to change name of non- */ @@ -953,7 +953,7 @@ button->flags &= ~NS_SCREAM_CURR; b->flags |= NS_SCREAM_CURR; - for (; d2 && d2->index != n; d2 = d2->next); + for (; (d2) && (d2->index != n); d2 = d2->next); if (d2) { /* pre-adjust curr ptr */ TermWin.screen->curr = d2; @@ -1009,13 +1009,13 @@ unsigned char changed = 0; D_BBAR(("bbar_show(%8p, %d) called.\n", bbar, visible)); - if (visible && !bbar_is_visible(bbar)) { + if ((visible) && (!bbar_is_visible(bbar))) { D_BBAR((" -> Making bbar visible.\n")); bbar_set_visible(bbar, 1); XMapWindow(Xdisplay, bbar->win); bbar_draw(bbar, IMAGE_STATE_CURRENT, MODE_MASK); changed = 1; - } else if (!visible && bbar_is_visible(bbar)) { + } else if ((!visible) && (bbar_is_visible(bbar))) { D_BBAR((" -> Making bbar invisible.\n")); bbar_set_visible(bbar, 0); XUnmapWindow(Xdisplay, bbar->win); @@ -1039,7 +1039,7 @@ bbar_resize(buttonbar_t *bbar, int w) { D_BBAR(("bbar_resize(%8p, %d) called.\n", bbar, w)); - if ((w >= 0) && !bbar_is_visible(bbar)) { + if ((w >= 0) && (!bbar_is_visible(bbar))) { D_BBAR((" -> Buttonbar is not visible, returning.")); return; } @@ -1093,7 +1093,7 @@ force_modes = MODE_MASK; } } - if (image_mode_is(image_bbar, MODE_MASK) && !((images[image_bbar].mode & MODE_MASK) & (force_modes))) { + if ((image_mode_is(image_bbar, MODE_MASK)) && (!((images[image_bbar].mode & MODE_MASK) & (force_modes)))) { return; } else if (!bbar_is_visible(bbar)) { return; @@ -1190,7 +1190,7 @@ top_y = 0; bottom_y = szHint.height; for (bbar = buttonbar; bbar; bbar = bbar->next) { - if (!bbar_is_visible(bbar) || !bbar_is_docked(bbar)) { + if ((!bbar_is_visible(bbar)) || (!bbar_is_docked(bbar))) { D_BBAR(("Skipping invisible/undocked buttonbar %8p\n", bbar)); continue; } @@ -1234,7 +1234,7 @@ register unsigned long h = 0; for (bbar = buttonbar; bbar; bbar = bbar->next) { - if ((bbar->state & dock_flag) && bbar_is_visible(bbar)) { + if ((bbar->state & dock_flag) && (bbar_is_visible(bbar))) { h += bbar->h; } } Index: eterm/Eterm/src/pixmap.c =================================================================== --- eterm/Eterm/src/pixmap.c (revision 51690) +++ eterm/Eterm/src/pixmap.c (working copy) @@ -231,7 +231,7 @@ unsigned short op = OP_NONE; char *token; - REQUIRE_RVAL(str && *str, OP_NONE); + REQUIRE_RVAL((str) && (*str), OP_NONE); D_PIXMAP(("parse_pixmap_ops(str [%s]) called.\n", str)); for (; (token = (char *) strsep(&str, ":"));) { @@ -306,10 +306,10 @@ } if (flags & (WidthValue | HeightValue)) { - if (w && !h) { + if ((w) && (!h)) { w = pmap->w * ((float) w / 100); h = pmap->h; - } else if (h && !w) { + } else if ((h) && (!w)) { w = pmap->w; h = pmap->h * ((float) h / 100); } @@ -323,7 +323,7 @@ changed++; } - if (!(flags & WidthValue) && geom[0] != '=') { + if ((!(flags & WidthValue)) && (geom[0] != '=')) { x += pmap->x; y += pmap->y; } else { @@ -368,16 +368,16 @@ D_PIXMAP(("reset_image(%8p, 0x%08x)\n", img, mask)); - if ((mask & RESET_NORM) && img->norm) { + if ((mask & RESET_NORM) && (img->norm)) { reset_simage(img->norm, mask); } - if ((mask & RESET_SELECTED) && img->selected) { + if ((mask & RESET_SELECTED) && (img->selected)) { reset_simage(img->selected, mask); } - if ((mask & RESET_CLICKED) && img->clicked) { + if ((mask & RESET_CLICKED) && (img->clicked)) { reset_simage(img->clicked, mask); } - if ((mask & RESET_DISABLED) && img->disabled) { + if ((mask & RESET_DISABLED) && (img->disabled)) { reset_simage(img->disabled, mask); } if (mask & RESET_MODE) { @@ -406,7 +406,7 @@ if (img->clicked == img->selected) { img->clicked = NULL; } - if (img->disabled == img->selected || img->disabled == img->clicked) { + if ((img->disabled == img->selected) || (img->disabled == img->clicked)) { img->disabled = NULL; } if (img->selected) { @@ -447,34 +447,34 @@ D_PIXMAP(("reset_simage(%8p, 0x%08x)\n", simg, mask)); - if ((mask & RESET_PMAP_PIXMAP) && simg->pmap->pixmap != None) { + if ((mask & RESET_PMAP_PIXMAP) && (simg->pmap->pixmap != None)) { IMLIB_FREE_PIXMAP(simg->pmap->pixmap); simg->pmap->pixmap = None; simg->pmap->mask = None; } - if ((mask & RESET_IMLIB_IM) && simg->iml->im) { + if ((mask & RESET_IMLIB_IM) && (simg->iml->im)) { imlib_context_set_image(simg->iml->im); imlib_free_image_and_decache(); simg->iml->im = NULL; } - if ((mask & RESET_IMLIB_BORDER) && simg->iml->border) { + if ((mask & RESET_IMLIB_BORDER) && (simg->iml->border)) { FREE(simg->iml->border); simg->iml->border = NULL; } - if ((mask & RESET_IMLIB_BEVEL) && simg->iml->bevel) { + if ((mask & RESET_IMLIB_BEVEL) && (simg->iml->bevel)) { FREE(simg->iml->bevel->edges); FREE(simg->iml->bevel); simg->iml->bevel = NULL; } - if ((mask & RESET_IMLIB_PAD) && simg->iml->pad) { + if ((mask & RESET_IMLIB_PAD) && (simg->iml->pad)) { FREE(simg->iml->pad); simg->iml->pad = NULL; } - if ((mask & RESET_IMLIB_MOD) && simg->iml->mod) { + if ((mask & RESET_IMLIB_MOD) && (simg->iml->mod)) { FREE(simg->iml->mod); simg->iml->mod = NULL; } - if ((mask & RESET_IMLIB_RMOD) && simg->iml->rmod) { + if ((mask & RESET_IMLIB_RMOD) && (simg->iml->rmod)) { if (simg->iml->rmod->imlib_mod) { imlib_context_set_color_modifier(simg->iml->rmod->imlib_mod); imlib_free_color_modifier(); @@ -482,7 +482,7 @@ FREE(simg->iml->rmod); simg->iml->rmod = NULL; } - if ((mask & RESET_IMLIB_GMOD) && simg->iml->gmod) { + if ((mask & RESET_IMLIB_GMOD) && (simg->iml->gmod)) { if (simg->iml->gmod->imlib_mod) { imlib_context_set_color_modifier(simg->iml->gmod->imlib_mod); imlib_free_color_modifier(); @@ -490,7 +490,7 @@ FREE(simg->iml->gmod); simg->iml->gmod = NULL; } - if ((mask & RESET_IMLIB_BMOD) && simg->iml->bmod) { + if ((mask & RESET_IMLIB_BMOD) && (simg->iml->bmod)) { if (simg->iml->bmod->imlib_mod) { imlib_context_set_color_modifier(simg->iml->bmod->imlib_mod); imlib_free_color_modifier(); @@ -691,9 +691,9 @@ XSetTSOrigin(Xdisplay, gc, pw - (x % pw), ph - (y % ph)); XSetFillStyle(Xdisplay, gc, FillTiled); XFillRectangle(Xdisplay, p, gc, 0, 0, width, height); - if ((which != image_bg || (BITFIELD_IS_SET(image_options, IMAGE_OPTIONS_ITRANS)) - || images[image_bg].current != images[image_bg].norm) - && need_colormod(simg->iml)) { + if (((which != image_bg) || (BITFIELD_IS_SET(image_options, IMAGE_OPTIONS_ITRANS)) + || (images[image_bg].current != images[image_bg].norm)) + && (need_colormod(simg->iml))) { colormod_trans(p, simg->iml, gc, width, height); } if (simg->iml->bevel) { @@ -744,7 +744,7 @@ } else { imlib_image_set_border(&bord_none); } - imlib_context_set_color_modifier((tmp_iml->mod && tmp_iml->mod->imlib_mod) ? tmp_iml->mod->imlib_mod : NULL); + imlib_context_set_color_modifier(((tmp_iml->mod) && (tmp_iml->mod->imlib_mod)) ? tmp_iml->mod->imlib_mod : NULL); if ((images[image_bg].current->pmap->w > 0) || (images[image_bg].current->pmap->op & OP_SCALE)) { D_PIXMAP(("Scaling image to %dx%d\n", scr->width, scr->height)); imlib_render_pixmaps_for_whole_image_at_size(&viewport_pixmap, &mask, scr->width, scr->height); @@ -767,7 +767,7 @@ } if (simg->pmap->pixmap != None) { XGetGeometry(Xdisplay, simg->pmap->pixmap, &dummy, &px, &py, &pw, &ph, &pb, &pd); - if (pw != width || ph != height) { + if ((pw != width) || (ph != height)) { IMLIB_FREE_PIXMAP(simg->pmap->pixmap); simg->pmap->pixmap = None; } else { @@ -809,7 +809,7 @@ REQUIRE(h > 0); if (which != image_max) { - if (image_mode_is(which, MODE_AUTO) && image_mode_is(which, ALLOW_AUTO)) { + if ((image_mode_is(which, MODE_AUTO)) && (image_mode_is(which, ALLOW_AUTO))) { char buff[255], *reply; const char *iclass, *state; @@ -855,7 +855,7 @@ } } } - } else if (image_mode_is(which, MODE_TRANS) && image_mode_is(which, ALLOW_TRANS)) { + } else if ((image_mode_is(which, MODE_TRANS)) && (image_mode_is(which, ALLOW_TRANS))) { Pixmap p; gc = LIBAST_X_CREATE_GC(0, NULL); @@ -867,7 +867,7 @@ } } LIBAST_X_FREE_GC(gc); - } else if (image_mode_is(which, MODE_VIEWPORT) && image_mode_is(which, ALLOW_VIEWPORT)) { + } else if ((image_mode_is(which, MODE_VIEWPORT)) && (image_mode_is(which, ALLOW_VIEWPORT))) { Pixmap p; gc = LIBAST_X_CREATE_GC(0, NULL); @@ -881,7 +881,7 @@ } } - if (((which == image_max) || (image_mode_is(which, MODE_IMAGE) && image_mode_is(which, ALLOW_IMAGE))) + if (((which == image_max) || (image_mode_is(which, MODE_IMAGE) && (image_mode_is(which, ALLOW_IMAGE)))) && (simg->iml)) { imlib_context_set_image(simg->iml->im); imlib_context_set_drawable(d); @@ -893,8 +893,8 @@ } else { imlib_image_set_border(&bord_none); } - imlib_context_set_color_modifier((simg->iml->mod && simg->iml->mod->imlib_mod) ? simg->iml->mod->imlib_mod : NULL); - if (w == imlib_image_get_width() && h == imlib_image_get_height()) { + imlib_context_set_color_modifier(((simg->iml->mod) && (simg->iml->mod->imlib_mod)) ? simg->iml->mod->imlib_mod : NULL); + if ((w == imlib_image_get_width()) && (h == imlib_image_get_height())) { imlib_render_pixmaps_for_whole_image(&pmap, &mask); } else { imlib_render_pixmaps_for_whole_image_at_size(&pmap, &mask, w, h); @@ -1018,12 +1018,12 @@ height, win)); D_PIXMAP(("Image mode is 0x%02x\n", images[which].mode)); #ifdef PIXMAP_SUPPORT - if ((which == image_bg) && image_mode_is(image_bg, MODE_VIEWPORT)) { + if ((which == image_bg) && (image_mode_is(image_bg, MODE_VIEWPORT))) { width = scr->width; height = scr->height; } #endif - if (!(width) || !(height)) + if ((!(width)) || (!(height))) return; gcvalue.foreground = gcvalue.background = PixColors[bgColor]; gc = LIBAST_X_CREATE_GC(GCForeground | GCBackground, &gcvalue); @@ -1104,7 +1104,7 @@ } } # ifdef PIXMAP_OFFSET - if (image_mode_is(which, MODE_TRANS) && image_mode_is(which, ALLOW_TRANS)) { + if ((image_mode_is(which, MODE_TRANS)) && (image_mode_is(which, ALLOW_TRANS))) { if (simg->pmap->pixmap != None) { LIBAST_X_FREE_PIXMAP(simg->pmap->pixmap); } @@ -1123,13 +1123,13 @@ } else { image_mode_fallback(which); } - } else if (image_mode_is(which, MODE_VIEWPORT) && image_mode_is(which, ALLOW_VIEWPORT)) { + } else if ((image_mode_is(which, MODE_VIEWPORT)) && (image_mode_is(which, ALLOW_VIEWPORT))) { Pixmap p; D_PIXMAP(("Viewport mode enabled. viewport_pixmap == 0x%08x and simg->pmap->pixmap == 0x%08x\n", viewport_pixmap, simg->pmap->pixmap)); p = create_viewport_pixmap(simg, win, 0, 0, width, height); - if (p && (p != simg->pmap->pixmap)) { + if ((p) && (p != simg->pmap->pixmap)) { if (simg->pmap->pixmap != None) { LIBAST_X_FREE_PIXMAP(simg->pmap->pixmap); } @@ -1152,7 +1152,7 @@ } } # endif - if (image_mode_is(which, MODE_IMAGE) && image_mode_is(which, ALLOW_IMAGE)) { + if ((image_mode_is(which, MODE_IMAGE)) && (image_mode_is(which, ALLOW_IMAGE))) { if (simg->iml->im) { int w = simg->pmap->w; int h = simg->pmap->h; @@ -1167,7 +1167,7 @@ xsize = imlib_image_get_width(); ysize = imlib_image_get_height(); D_PIXMAP(("w == %d, h == %d, x == %d, y == %d, xsize == %d, ysize == %d\n", w, h, x, y, xsize, ysize)); - if ((simg->pmap->op & OP_PROPSCALE) && w && h) { + if ((simg->pmap->op & OP_PROPSCALE) && (w) && (h)) { double x_ratio, y_ratio; x_ratio = ((double) width) / ((double) xsize); @@ -1186,10 +1186,10 @@ xscaled = (unsigned short) ((xsize * x_ratio) * ((float) w / 100.0)); yscaled = (unsigned short) ((ysize * x_ratio) * ((float) h / 100.0)); } else { - if (!w && BITFIELD_IS_SET(simg->pmap->op, OP_HSCALE)) { + if ((!w) && (BITFIELD_IS_SET(simg->pmap->op, OP_HSCALE))) { w = 100; } - if (!h && BITFIELD_IS_SET(simg->pmap->op, OP_VSCALE)) { + if ((!h) && (BITFIELD_IS_SET(simg->pmap->op, OP_VSCALE))) { h = 100; } if (w > 0) { @@ -1214,20 +1214,20 @@ } else { imlib_image_set_border(&bord_none); } - imlib_context_set_color_modifier((simg->iml->mod && simg->iml->mod->imlib_mod) ? simg->iml->mod->imlib_mod : NULL); + imlib_context_set_color_modifier(((simg->iml->mod) && (simg->iml->mod->imlib_mod)) ? simg->iml->mod->imlib_mod : NULL); D_PIXMAP(("Rendering image simg->iml->im [%8p] to %hdx%hd pixmap\n", simg->iml->im, xscaled, yscaled)); imlib_render_pixmaps_for_whole_image_at_size(&simg->pmap->pixmap, &simg->pmap->mask, xscaled, yscaled); rendered = 1; if (simg->pmap->pixmap != None) { IMLIB_REGISTER_PIXMAP(simg->pmap->pixmap); - if (pixmap != None && pixmap != simg->pmap->pixmap) { + if ((pixmap != None) && (pixmap != simg->pmap->pixmap)) { IMLIB_FREE_PIXMAP(pixmap); } - if (xscaled != width || yscaled != height || xpos != 0 || ypos != 0) { + if ((xscaled != width) || (yscaled != height) || (xpos != 0) || (ypos != 0)) { unsigned char single; /* This tells us if we have a single, non-tiled image which does not entirely fill the window */ - single = ((xscaled < width || yscaled < height) && !(simg->pmap->op & OP_TILE)) ? 1 : 0; + single = (((xscaled < width) || (yscaled < height)) && (!(simg->pmap->op & OP_TILE))) ? 1 : 0; pixmap = simg->pmap->pixmap; simg->pmap->pixmap = LIBAST_X_CREATE_PIXMAP(width, height); if (single) { @@ -1292,7 +1292,7 @@ simg->pmap->pixmap = LIBAST_X_CREATE_PIXMAP(width, height); XSetForeground(Xdisplay, gc, ((which == image_bg) ? (PixColors[bgColor]) : (simg->bg))); XFillRectangle(Xdisplay, simg->pmap->pixmap, gc, 0, 0, width, height); - if (simg->iml->bevel && simg->iml->bevel->edges) { + if ((simg->iml->bevel) && (simg->iml->bevel->edges)) { DRAW_SOLID_BEVEL(simg->pmap->pixmap, width, height, simg->bg, simg->iml->bevel->up, simg->iml->bevel->edges->left); } @@ -1319,7 +1319,7 @@ int maxpath, len; struct stat fst; - if (!pathlist || !file) { /* If either one is NULL, there really isn't much point in going on.... */ + if ((!pathlist) || (!file)) { /* If either one is NULL, there really isn't much point in going on.... */ return ((const char *) NULL); } getcwd(name, PATH_MAX); @@ -1370,7 +1370,7 @@ } else { D_OPTIONS(("Unable to access %s -- %s\n", name, strerror(errno))); } - for (path = pathlist; path && *path != '\0'; path = p) { + for (path = pathlist; (path) && (*path != '\0'); path = p) { int n; /* colon delimited */ @@ -1379,13 +1379,13 @@ n = (p - path); if (*p != '\0') p++; - if (n > 0 && n <= maxpath) { + if ((n > 0) && (n <= maxpath)) { if (*path == '~') { unsigned int l; char *home_dir = getenv("HOME"); - if (home_dir && *home_dir) { + if ((home_dir) && (*home_dir)) { l = strlen(home_dir); if (l + n < (unsigned) maxpath) { strcpy(name, home_dir); @@ -1495,7 +1495,7 @@ colormod_t *mod = iml->mod, *rmod = iml->rmod, *gmod = iml->gmod, *bmod = iml->bmod; DATA8 rt[256], gt[256], bt[256]; - REQUIRE(mod || rmod || gmod || bmod); + REQUIRE((mod) || (rmod) || (gmod) || (bmod)); /* When any changes is made to any individual color modifier for an image, this function must be called to update the overall Imlib2 color modifier. */ D_PIXMAP(("Updating color modifier tables for %8p\n", iml)); @@ -1511,15 +1511,15 @@ imlib_reset_color_modifier(); } imlib_get_color_modifier_tables(rt, gt, bt, NULL); - if (rmod && rmod->imlib_mod) { + if ((rmod) && (rmod->imlib_mod)) { imlib_context_set_color_modifier(rmod->imlib_mod); imlib_get_color_modifier_tables(rt, NULL, NULL, NULL); } - if (gmod && gmod->imlib_mod) { + if ((gmod) && (gmod->imlib_mod)) { imlib_context_set_color_modifier(gmod->imlib_mod); imlib_get_color_modifier_tables(NULL, gt, NULL, NULL); } - if (bmod && bmod->imlib_mod) { + if ((bmod) && (bmod->imlib_mod)) { imlib_context_set_color_modifier(bmod->imlib_mod); imlib_get_color_modifier_tables(NULL, NULL, bt, NULL); } @@ -1536,11 +1536,11 @@ } } -# define MOD_IS_SET(mod) ((mod) && ((mod)->brightness != 0x100 || (mod)->contrast != 0x100 || (mod)->gamma != 0x100)) +# define MOD_IS_SET(mod) ((mod) && (((mod)->brightness != 0x100) || ((mod)->contrast != 0x100) || ((mod)->gamma != 0x100))) unsigned char need_colormod(register imlib_t *iml) { - if (MOD_IS_SET(iml->mod) || MOD_IS_SET(iml->rmod) || MOD_IS_SET(iml->gmod) || MOD_IS_SET(iml->bmod)) { + if ((MOD_IS_SET(iml->mod)) || (MOD_IS_SET(iml->rmod)) || (MOD_IS_SET(iml->gmod)) || (MOD_IS_SET(iml->bmod))) { D_PIXMAP(("Color modifier active.\n")); return 1; } else { @@ -1779,7 +1779,7 @@ bm = shade; } - if (rm == 256 && gm == 256 && bm == 256) { + if ((rm == 256) && (gm == 256) && (bm == 256)) { return; /* Nothing to do */ } D_PIXMAP((" -> rm == %hu, gm == %hu, bm == %hu, shade == %hu\n", rm, gm, bm, shade)); @@ -2044,7 +2044,7 @@ D_PIXMAP(("Desktop pixmap has changed. Updating desktop_pixmap\n")); free_desktop_pixmap(); orig_desktop_pixmap = p; - if (!(BITFIELD_IS_SET(image_options, IMAGE_OPTIONS_ITRANS)) && need_colormod(images[image_bg].current->iml)) { + if ((!(BITFIELD_IS_SET(image_options, IMAGE_OPTIONS_ITRANS))) && (need_colormod(images[image_bg].current->iml))) { int px, py; unsigned int pw, ph, pb, pd; Window w; @@ -2056,7 +2056,7 @@ gc = LIBAST_X_CREATE_GC(GCForeground | GCBackground, &gcvalue); XGetGeometry(Xdisplay, p, &w, &px, &py, &pw, &ph, &pb, &pd); D_PIXMAP(("XGetGeometry() returned w = 0x%08x, pw == %u, ph == %u\n", w, pw, ph)); - if (pw < (unsigned int) scr->width || ph < (unsigned int) scr->height) { + if ((pw < (unsigned int) scr->width) || (ph < (unsigned int) scr->height)) { desktop_pixmap = LIBAST_X_CREATE_PIXMAP(pw, ph); XCopyArea(Xdisplay, p, desktop_pixmap, gc, 0, 0, pw, ph, 0, 0); colormod_trans(desktop_pixmap, images[image_bg].current->iml, gc, pw, ph); @@ -2109,7 +2109,7 @@ void free_desktop_pixmap(void) { - if (desktop_pixmap_is_mine && desktop_pixmap != None) { + if ((desktop_pixmap_is_mine) && (desktop_pixmap != None)) { LIBAST_X_FREE_PIXMAP(desktop_pixmap); desktop_pixmap_is_mine = 0; } @@ -2169,7 +2169,7 @@ tmp_cmod = imlib_create_color_modifier(); imlib_context_set_color_modifier(tmp_cmod); imlib_reset_color_modifier(); - if (filename && *filename) { + if ((filename) && (*filename)) { if (!(icon_path = search_path(rs_path, filename))) icon_path = search_path(getenv(PATH_ENV), filename); if (icon_path) { @@ -2186,7 +2186,7 @@ D_PIXMAP(("Got icon sizes: Width %d to %d +/- %d, Height %d to %d +/- %d\n", icon_sizes[i].min_width, icon_sizes[i].max_width, icon_sizes[i].width_inc, icon_sizes[i].min_height, icon_sizes[i].max_height, icon_sizes[i].height_inc)); - if (icon_sizes[i].max_width > 64 || icon_sizes[i].max_height > 64) { + if ((icon_sizes[i].max_width > 64) || (icon_sizes[i].max_height > 64)) { continue; } /* Find the largest supported size <= 64 */ Index: eterm/Eterm/src/actions.c =================================================================== --- eterm/Eterm/src/actions.c (revision 51690) +++ eterm/Eterm/src/actions.c (working copy) @@ -63,7 +63,7 @@ USE_VAR(ev); REQUIRE_RVAL(action->param.string != NULL, 0); #ifdef ESCREEN - if (TermWin.screen && TermWin.screen->backend) { + if ((TermWin.screen) && (TermWin.screen->backend)) { # ifdef NS_HAVE_SCREEN /* translate escapes */ ns_parse_screen_interactive(TermWin.screen, action->param.string); @@ -177,19 +177,19 @@ /* These tests can't use LOGICAL_XOR because the second test has an additional restriction that the Mod?Mask cannot be set in m; i.e., we want to ignore any Mod?Mask assigned to Alt, Meta, or the NumLock On state. */ - if (((mod & MOD_MOD1) && !(x_mod & Mod1Mask)) || (!(mod & MOD_MOD1) && (x_mod & Mod1Mask) && !(Mod1Mask & m))) { + if (((mod & MOD_MOD1) && (!(x_mod & Mod1Mask))) || ((!(mod & MOD_MOD1)) && (x_mod & Mod1Mask) && (!(Mod1Mask & m)))) { return FALSE; } - if (((mod & MOD_MOD2) && !(x_mod & Mod2Mask)) || (!(mod & MOD_MOD2) && (x_mod & Mod2Mask) && !(Mod2Mask & m))) { + if (((mod & MOD_MOD2) && (!(x_mod & Mod2Mask))) || ((!(mod & MOD_MOD2)) && (x_mod & Mod2Mask) && (!(Mod2Mask & m)))) { return FALSE; } - if (((mod & MOD_MOD3) && !(x_mod & Mod3Mask)) || (!(mod & MOD_MOD3) && (x_mod & Mod3Mask) && !(Mod3Mask & m))) { + if (((mod & MOD_MOD3) && (!(x_mod & Mod3Mask))) || ((!(mod & MOD_MOD3)) && (x_mod & Mod3Mask) && (!(Mod3Mask & m)))) { return FALSE; } - if (((mod & MOD_MOD4) && !(x_mod & Mod4Mask)) || (!(mod & MOD_MOD4) && (x_mod & Mod4Mask) && !(Mod4Mask & m))) { + if (((mod & MOD_MOD4) && (!(x_mod & Mod4Mask))) || ((!(mod & MOD_MOD4)) && (x_mod & Mod4Mask) && (!(Mod4Mask & m)))) { return FALSE; } - if (((mod & MOD_MOD5) && !(x_mod & Mod5Mask)) || (!(mod & MOD_MOD5) && (x_mod & Mod5Mask) && !(Mod5Mask & m))) { + if (((mod & MOD_MOD5) && (!(x_mod & Mod5Mask))) || ((!(mod & MOD_MOD5)) && (x_mod & Mod5Mask) && (!(Mod5Mask & m)))) { return FALSE; } } @@ -203,15 +203,15 @@ action_t *action; ASSERT_RVAL(ev != NULL, 0); - ASSERT_RVAL(ev->xany.type == ButtonPress || ev->xany.type == KeyPress, 0); + ASSERT_RVAL((ev->xany.type == ButtonPress) || (ev->xany.type == KeyPress), 0); D_ACTIONS(("Event %8p: Button %d, Keysym 0x%08x, Key State 0x%08x (modifiers " MOD_FMT ")\n", ev, ev->xbutton.button, keysym, ev->xkey.state, SHOW_X_MODS(ev->xkey.state))); for (action = action_list; action; action = action->next) { /* The very first thing we do is match the event type to the type of the current action. This means that we'll only run through the modifier checks below if we absolutely have to. */ - if ((ev->xany.type == ButtonPress && action_check_button(action->button, ev->xbutton.button)) - || (ev->xany.type == KeyPress && action_check_keysym(action->keysym, keysym))) { + if (((ev->xany.type == ButtonPress) && (action_check_button(action->button, ev->xbutton.button))) + || ((ev->xany.type == KeyPress) && (action_check_keysym(action->keysym, keysym)))) { if (action_check_modifiers(action->mod, ev->xkey.state)) { D_ACTIONS(("Match found.\n")); /* If we've passed all the above tests, it's a match. Dispatch the handler. */ @@ -228,12 +228,12 @@ action_t *action; - if (!action_list || !(action = action_find_match(mod, button, keysym))) { + if ((!action_list) || (!(action = action_find_match(mod, button, keysym)))) { action = (action_t *) MALLOC(sizeof(action_t)); action->next = action_list; action_list = action; } else { - if (action->type == ACTION_STRING || action->type == ACTION_ECHO || action->type == ACTION_SCRIPT) { + if ((action->type == ACTION_STRING) || (action->type == ACTION_ECHO) || (action->type == ACTION_SCRIPT)) { if (action->param.string) { FREE(action->param.string); } Index: eterm/Eterm/src/startup.c =================================================================== --- eterm/Eterm/src/startup.c (revision 51690) +++ eterm/Eterm/src/startup.c (working copy) @@ -114,7 +114,7 @@ privileges(REVERT); #endif - if (!Xdisplay && !(Xdisplay = XOpenDisplay(display_name))) { + if ((!Xdisplay) && (!(Xdisplay = XOpenDisplay(display_name)))) { libast_print_error("Can't open display %s. Set $DISPLAY or use --display\n", NONULL(display_name)); exit(EXIT_FAILURE); @@ -177,7 +177,7 @@ putenv(tmp); } #if defined(PIXMAP_SUPPORT) - if (rs_path || theme_dir || user_dir) { + if ((rs_path) || (theme_dir) || (user_dir)) { register unsigned long len; register char *tmp; @@ -250,7 +250,7 @@ /* Initialize the scrollbar */ scrollbar_init(szHint.width, szHint.height - bbar_calc_docked_height(BBAR_DOCKED)); scrollbar_mapping((BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_SCROLLBAR)) - && !((BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_SCROLLBAR_POPUP)) && !TermWin.focus)); + && (!((BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_SCROLLBAR_POPUP)) && (!TermWin.focus)))); /* Initialize the menu subsystem. */ menu_init(); @@ -315,7 +315,7 @@ /* Check locale for UTF-8 and deactivate if needed. */ val = getenv("LANG"); D_CMD(("Checking locale \"%s\" for UTF-8.\n", NONULL(val))); - if (val && *val) { + if ((val) && (*val)) { char *tmp; tmp = strcasestr(val, ".utf"); Index: eterm/Eterm/src/script.c =================================================================== --- eterm/Eterm/src/script.c (revision 51690) +++ eterm/Eterm/src/script.c (working copy) @@ -104,7 +104,7 @@ char *xx, *yy; n = spiftool_num_words(action); - if (n == 3 || n == 4) { + if ((n == 3) || (n == 4)) { if (n == 3) { win = TermWin.parent; } @@ -119,7 +119,7 @@ char *ww, *hh; n = spiftool_num_words(action); - if (n == 3 || n == 4) { + if ((n == 3) || (n == 4)) { if (n == 3) { win = TermWin.parent; } @@ -162,7 +162,7 @@ if (params) { for (i = 0; (buffer_id = params[i]); i++) { if (*buffer_id) { - if (*buffer_id >= '0' && *buffer_id <= '7') { + if ((*buffer_id >= '0') && (*buffer_id <= '7')) { sel = (Atom) ((int) XA_CUT_BUFFER0 + (int) (*buffer_id - '0')); } else if (!BEG_STRCASECMP(buffer_id, "clipboard")) { sel = props[PROP_CLIPBOARD]; @@ -190,7 +190,7 @@ { spif_charptr_t *tmp; - for (tmp = params; tmp && *tmp; tmp++) { + for (tmp = params; (tmp) && (*tmp); tmp++) { tt_write(*tmp, strlen(*tmp)); } } @@ -210,8 +210,8 @@ unsigned char code = 0; char *tmp; - if (params && *params) { - if (isdigit(params[0][0]) || (params[0][0] == '-' && isdigit(params[0][1]))) { + if ((params) && (*params)) { + if ((isdigit(params[0][0])) || ((params[0][0] == '-') && (isdigit(params[0][1])))) { code = (unsigned char) atoi(params[0]); } else { tmp = spiftool_join(" ", params); @@ -234,7 +234,7 @@ { int sig; - if (params && *params) { + if ((params) && (*params)) { sig = atoi(params[0]); } else { sig = SIGTERM; @@ -263,7 +263,7 @@ if (params) { for (i = 0; (buffer_id = params[i]); i++) { if (*buffer_id) { - if (*buffer_id >= '0' && *buffer_id <= '7') { + if ((*buffer_id >= '0') && (*buffer_id <= '7')) { sel = (Atom) ((int) XA_CUT_BUFFER0 + (int) (*buffer_id - '0')); } else if (!BEG_STRCASECMP(buffer_id, "clipboard")) { sel = props[PROP_CLIPBOARD]; @@ -293,7 +293,7 @@ void script_handler_save(spif_charptr_t *params) { - if (params && *params) { + if ((params) && (*params)) { if (!strcasecmp(params[0], "theme")) { save_config(params[1], SAVE_THEME_CONFIG); } else { @@ -314,7 +314,7 @@ void script_handler_save_buff(spif_charptr_t *params) { - if (params && *params) { + if ((params) && (*params)) { scr_dump_to_file(params[0]); } else { scr_dump(); @@ -341,7 +341,7 @@ long count; int direction = DN; - if (params && *params) { + if ((params) && (*params)) { cnt_float = strtod(params[0], &type); if (cnt_float == 0.0) { return; @@ -352,11 +352,11 @@ if (!type) { type = params[1]; } - if (type && *type) { - for (; *type && !isalpha(*type); type++); + if ((type) && (*type)) { + for (; (*type) && (!isalpha(*type)); type++); if (str_leading_match("lines", type)) { count = (long) cnt_float; - } else if (str_leading_match("pages", type) || str_leading_match("screens", type)) { + } else if ((str_leading_match("pages", type)) || (str_leading_match("screens", type))) { count = (long) ((cnt_float * TermWin.nrow) - CONTEXT_LINES); } else if (str_leading_match("buffers", type)) { count = (long) (cnt_float * (TermWin.nrow + TermWin.saveLines)); @@ -388,7 +388,7 @@ { static char *search = NULL; - if (params && *params) { + if ((params) && (*params)) { if (search) { FREE(search); } @@ -410,7 +410,7 @@ { char *tmp; - if (params && *params) { + if ((params) && (*params)) { tmp = spiftool_join(" ", params); system_no_wait(tmp); FREE(tmp); @@ -430,7 +430,7 @@ { spif_charptr_t *tmp; - for (tmp = params; tmp && *tmp; tmp++) { + for (tmp = params; (tmp) && (*tmp); tmp++) { cmd_write(*tmp, strlen(*tmp)); } } @@ -447,7 +447,7 @@ char *tmp; int ret; - if (params && *params) { + if ((params) && (*params)) { tmp = spiftool_join(" ", params); } else { tmp = NULL; @@ -473,7 +473,7 @@ { char *tmp; - if (params && *params) { + if ((params) && (*params)) { tmp = spiftool_join(" ", params); scr_refresh(DEFAULT_REFRESH); menu_dialog(NULL, tmp, 1, NULL, NULL); @@ -507,22 +507,22 @@ int index = 1; int no = -1; /* which display? */ - if (!params || !*params || !sess) { + if ((!params) || (!*params) || (!sess)) { return; } p = spiftool_downcase_str(*params); a = params[index++]; - if (a && isdigit(*a)) { + if ((a) && (isdigit(*a))) { no = atoi(a); a = params[index++]; D_ESCREEN(("disp #%d\n", no)); } - if (!strcmp(p, "goto") || !strcmp(p, "go") || !strcmp(p, "focus") || !strcmp(p, "raise")) { + if ((!strcmp(p, "goto")) || (!strcmp(p, "go")) || (!strcmp(p, "focus")) || (!strcmp(p, "raise"))) { D_ESCREEN(("Go to display %d\n", no)); ns_go2_disp(sess, no); - } else if (!strcmp(p, "prvs") || !strcmp(p, "prev") || !strcmp(p, "previous")) { + } else if ((!strcmp(p, "prvs")) || (!strcmp(p, "prev")) || (!strcmp(p, "previous"))) { D_ESCREEN(("Go to previous display\n")); ns_rel_disp(sess, -1); } else if (!strcmp(p, "next")) { @@ -532,36 +532,36 @@ D_ESCREEN(("Toggle display\n")); ns_tog_disp(sess); } else if (!strcmp(p, "new")) { - if (!a || !*a) { + if ((!a) || (!*a)) { D_ESCREEN(("disp new\n")); ns_add_disp(sess, no, ""); - } else if (!a || !*a || !strcasecmp(a, "ask")) { + } else if ((!a) || (!*a) || (!strcasecmp(a, "ask"))) { D_ESCREEN(("disp new ask\n")); ns_add_disp(sess, no, NULL); } else { D_ESCREEN(("disp new \"%s\"\n", a)); ns_add_disp(sess, no, a); } - } else if (!strcmp(p, "title") || !strcmp(p, "name") || !strcmp(p, "rename")) { - if (!a || !*a || !strcasecmp(a, "ask")) { + } else if ((!strcmp(p, "title")) || (!strcmp(p, "name")) || (!strcmp(p, "rename"))) { + if ((!a) || (!*a) || (!strcasecmp(a, "ask"))) { D_ESCREEN(("disp name ask\n")); ns_ren_disp(sess, no, NULL); } else { D_ESCREEN(("disp name \"%s\"\n", a)); ns_ren_disp(sess, no, a); } - } else if (!strcmp(p, "kill") || !strcmp(p, "close")) { - if (!a || !*a || !strcasecmp(a, "ask")) { + } else if ((!strcmp(p, "kill")) || (!strcmp(p, "close"))) { + if ((!a) || (!*a) || (!strcasecmp(a, "ask"))) { D_ESCREEN(("disp kill ask\n")); ns_rem_disp(sess, no, TRUE); } else { D_ESCREEN(("disp kill \"%s\"\n", a)); ns_rem_disp(sess, no, FALSE); } - } else if (!strcmp(p, "watch") || !strcmp(p, "monitor")) { + } else if ((!strcmp(p, "watch")) || (!strcmp(p, "monitor"))) { D_ESCREEN(("Monitor display %d\n", no)); ns_mon_disp(sess, no, NS_MON_TOGGLE_NOISY); - } else if (!strcmp(p, "back") || !strcmp(p, "backlog") || !strcmp(p, "scrollback")) { + } else if ((!strcmp(p, "back")) || (!strcmp(p, "backlog")) || (!strcmp(p, "scrollback"))) { D_ESCREEN(("View scrollback on display %d\n", no)); ns_sbb_disp(sess, no); } else { @@ -596,7 +596,7 @@ int index = 1; int no = -1; - if (!params || !*params || !sess) { + if ((!params) || (!*params) || (!sess)) { return; } if (!TermWin.screen->curr) { @@ -608,16 +608,16 @@ p = spiftool_downcase_str(*params); a = params[index++]; - if (a && isdigit(*a)) { + if ((a) && (isdigit(*a))) { no = atoi(a); a = params[index++]; D_ESCREEN(("region #%d\n", no)); } - if (!strcmp(p, "goto") || !strcmp(p, "go") || !strcmp(p, "focus") || !strcmp(p, "raise")) { + if ((!strcmp(p, "goto")) || (!strcmp(p, "go")) || (!strcmp(p, "focus")) || (!strcmp(p, "raise"))) { D_ESCREEN(("Go to region %d of display %8p\n", no, disp)); ns_go2_region(sess, disp, no); - } else if (!strcmp(p, "prvs") || !strcmp(p, "prev") || !strcmp(p, "previous")) { + } else if ((!strcmp(p, "prvs")) || (!strcmp(p, "prev")) || (!strcmp(p, "previous"))) { D_ESCREEN(("Go to previous region of display %8p\n", disp)); ns_rel_region(sess, disp, -1); } else if (!strcmp(p, "next")) { @@ -626,37 +626,37 @@ } else if (!strcmp(p, "toggle")) { D_ESCREEN(("Toggle region of display %8p\n", disp)); ns_tog_region(sess, disp); - } else if (!strcmp(p, "new") || !strcmp(p, "spiftool_split")) { - if (!a || !*a || !strcasecmp(a, "ask")) { + } else if ((!strcmp(p, "new")) || (!strcmp(p, "spiftool_split"))) { + if ((!a) || (!*a) || (!strcasecmp(a, "ask"))) { D_ESCREEN(("region new ask\n")); ns_add_region(sess, disp, no, NULL); } else { D_ESCREEN(("region new \"%s\"\n", a)); ns_add_region(sess, disp, no, a); } - } else if (!strcmp(p, "title") || !strcmp(p, "name") || !strcmp(p, "rename")) { - if (!a || !*a || !strcasecmp(a, "ask")) { + } else if ((!strcmp(p, "title")) || (!strcmp(p, "name")) || (!strcmp(p, "rename"))) { + if ((!a) || (!*a) || (!strcasecmp(a, "ask"))) { D_ESCREEN(("region name ask\n")); ns_ren_region(sess, disp, no, NULL); } else { D_ESCREEN(("region name \"%s\"\n", a)); ns_ren_region(sess, disp, no, a); } - } else if (!strcmp(p, "kill") || !strcmp(p, "close")) { - if (!a || !*a || !strcasecmp(a, "ask")) { + } else if ((!strcmp(p, "kill")) || (!strcmp(p, "close"))) { + if ((!a) || (!*a) || (!strcasecmp(a, "ask"))) { D_ESCREEN(("region kill ask\n")); ns_rem_region(sess, disp, no, TRUE); } else { D_ESCREEN(("disp kill \"%s\"\n", a)); ns_rem_region(sess, disp, no, FALSE); } - } else if (!strcmp(p, "only") || !strcmp(p, "unsplit") || !strcmp(p, "full") || !strcmp(p, "fullscreen")) { + } else if ((!strcmp(p, "only")) || (!strcmp(p, "unsplit")) || (!strcmp(p, "full")) || (!strcmp(p, "fullscreen"))) { D_ESCREEN(("Maximizing region %d of display %8p\n", no, disp)); ns_one_region(sess, disp, no); - } else if (!strcmp(p, "watch") || !strcmp(p, "monitor")) { + } else if ((!strcmp(p, "watch")) || (!strcmp(p, "monitor"))) { D_ESCREEN(("Monitor region %d of display %8p\n", no, disp)); ns_mon_region(sess, disp, no); - } else if (!strcmp(p, "back") || !strcmp(p, "backlog") || !strcmp(p, "scrollback")) { + } else if ((!strcmp(p, "back")) || (!strcmp(p, "backlog")) || (!strcmp(p, "scrollback"))) { D_ESCREEN(("View scrollback for region %d of display %8p\n", no, disp)); ns_sbb_region(sess, disp, no); } else { @@ -675,7 +675,7 @@ { char *tmp; - if (params && *params) { + if ((params) && (*params)) { tmp = spiftool_join(" ", params); ns_statement(TermWin.screen, tmp); FREE(tmp); @@ -718,7 +718,7 @@ for (i = 0; i < handler_count; i++) { /* Small optimization. Only call strcasecmp() if the first letter matches. */ if ((tolower(name[0]) == tolower(script_handlers[i].name[0])) - && !strcasecmp(name, script_handlers[i].name)) { + && (!strcasecmp(name, script_handlers[i].name))) { return &script_handlers[i]; } } Index: eterm/Eterm/src/font.c =================================================================== --- eterm/Eterm/src/font.c (revision 51690) +++ eterm/Eterm/src/font.c (working copy) @@ -291,7 +291,7 @@ /* Find a matching name/type in the cache. Just a search; no reference counting happens here. */ for (current = font_cache; current; current = current->next) { D_FONT((" -> Checking current (%8p), type == %d, name == %s\n", current, current->type, NONULL(current->name))); - if ((current->type == type) && !strcasecmp(current->name, name)) { + if ((current->type == type) && (!strcasecmp(current->name, name))) { D_FONT((" -> Match!\n")); return (current); } @@ -313,7 +313,7 @@ /* This is also a simple search, but it returns the fontinfo rather than the cache entry. */ for (current = font_cache; current; current = current->next) { D_FONT((" -> Checking current (%8p), type == %d, name == %s\n", current, current->type, NONULL(current->name))); - if ((current->type == type) && !strcasecmp(current->name, name)) { + if ((current->type == type) && (!strcasecmp(current->name, name))) { D_FONT((" -> Match!\n")); switch (type) { case FONT_TYPE_X: @@ -494,7 +494,7 @@ break; default: - if (*fontname != '\0' && !isdigit(*fontname)) + if ((*fontname != '\0') && (!isdigit(*fontname))) return; /* It's not a number. Punt. */ /* Set current font to font N */ BOUND(idx, 0, (font_cnt - 1)); @@ -539,7 +539,7 @@ } #ifndef NO_BOLDFONT - if (init && rs_boldFont) { + if ((init) && (rs_boldFont)) { /* If we're initializing, load the bold font too. */ boldFont = load_font(rs_boldFont, "-misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1", FONT_TYPE_X); } @@ -590,7 +590,7 @@ TermWin.fprop = 1; /* Proportional font */ /* For proportional fonts with large size variations, do some math-fu to try and help the appearance */ - if (TermWin.fprop && (BITFIELD_IS_SET(vt_options, VT_OPTIONS_PROPORTIONAL)) && TermWin.font->per_char + if ((TermWin.fprop) && (BITFIELD_IS_SET(vt_options, VT_OPTIONS_PROPORTIONAL)) && (TermWin.font->per_char) && (TermWin.font->max_bounds.width - TermWin.font->min_bounds.width >= 3)) { int cw, n = 0, sum = 0, sumsq = 0, min_w, max_w; unsigned int i; @@ -602,7 +602,7 @@ UPPER_BOUND(max_w, 1024); for (i = TermWin.font->min_char_or_byte2; i <= TermWin.font->max_char_or_byte2; i++) { cw = TermWin.font->per_char[i].width; - if (cw >= min_w && cw <= max_w) { + if ((cw >= min_w) && (cw <= max_w)) { sum += cw; sumsq += (cw * cw); n++; @@ -624,7 +624,7 @@ } /* If the sizes haven't changed, we don't have to update the hints */ - if (fw == TermWin.fwidth && fh == TermWin.fheight) { + if ((fw == TermWin.fwidth) && (fh == TermWin.fheight)) { /* but we _do_ need to redraw to show the new font */ scr_touch(); return; @@ -647,7 +647,7 @@ LOWER_BOUND(fw, boldFont->max_bounds.width); } - if (fw == TermWin.fwidth && fh == TermWin.fheight) { + if ((fw == TermWin.fwidth) && (fh == TermWin.fheight)) { TermWin.boldFont = boldFont; } } @@ -687,21 +687,21 @@ static unsigned char get_corner(const char *corner) { - if (!BEG_STRCASECMP(corner, "tl ") || !BEG_STRCASECMP(corner, "top_left")) { + if ((!BEG_STRCASECMP(corner, "tl ")) || (!BEG_STRCASECMP(corner, "top_left"))) { return SHADOW_TOP_LEFT; - } else if (!BEG_STRCASECMP(corner, "t ") || !BEG_STRCASECMP(corner, "top")) { + } else if ((!BEG_STRCASECMP(corner, "t ")) || (!BEG_STRCASECMP(corner, "top"))) { return SHADOW_TOP; - } else if (!BEG_STRCASECMP(corner, "tr ") || !BEG_STRCASECMP(corner, "top_right")) { + } else if ((!BEG_STRCASECMP(corner, "tr ")) || (!BEG_STRCASECMP(corner, "top_right"))) { return SHADOW_TOP_RIGHT; - } else if (!BEG_STRCASECMP(corner, "l ") || !BEG_STRCASECMP(corner, "left")) { + } else if ((!BEG_STRCASECMP(corner, "l ")) || (!BEG_STRCASECMP(corner, "left"))) { return SHADOW_LEFT; - } else if (!BEG_STRCASECMP(corner, "r ") || !BEG_STRCASECMP(corner, "right")) { + } else if ((!BEG_STRCASECMP(corner, "r ")) || (!BEG_STRCASECMP(corner, "right"))) { return SHADOW_RIGHT; - } else if (!BEG_STRCASECMP(corner, "bl ") || !BEG_STRCASECMP(corner, "bottom_left")) { + } else if ((!BEG_STRCASECMP(corner, "bl ")) || (!BEG_STRCASECMP(corner, "bottom_left"))) { return SHADOW_BOTTOM_LEFT; - } else if (!BEG_STRCASECMP(corner, "b ") || !BEG_STRCASECMP(corner, "bottom")) { + } else if ((!BEG_STRCASECMP(corner, "b ")) || (!BEG_STRCASECMP(corner, "bottom"))) { return SHADOW_BOTTOM; - } else if (!BEG_STRCASECMP(corner, "br ") || !BEG_STRCASECMP(corner, "bottom_right")) { + } else if ((!BEG_STRCASECMP(corner, "br ")) || (!BEG_STRCASECMP(corner, "bottom_right"))) { return SHADOW_BOTTOM_RIGHT; } else { return 255; Index: eterm/Eterm/src/term.c =================================================================== --- eterm/Eterm/src/term.c (revision 51690) +++ eterm/Eterm/src/term.c (working copy) @@ -468,7 +468,7 @@ /* The num lock key toggles application keypad mode. Num lock on, app. keypad mode off. */ - if (numlock_state || (ev->xkey.state & NumLockMask)) { + if ((numlock_state) || (ev->xkey.state & NumLockMask)) { numlock_state = (ev->xkey.state & NumLockMask); PrivMode((!numlock_state), PrivMode_aplKP); } @@ -503,7 +503,7 @@ safe_print_string(kbuf, len))); /* If there is no string and it's a Latin2-7 character, replace it with the Latin1 character instead. */ - if (!len && (keysym >= 0x0100) && (keysym < 0x0900)) { + if ((!len) && (keysym >= 0x0100) && (keysym < 0x0900)) { len = 1; kbuf[0] = (keysym & 0xff); } @@ -518,7 +518,7 @@ (void) ns_parse_screen_key(TermWin.screen, kbuf[0]); LK_RET(); } - } else if (TermWin.screen && TermWin.screen->escape == kbuf[0]) { + } else if ((TermWin.screen) && (TermWin.screen->escape == kbuf[0])) { escreen_escape = 1; LK_RET(); } @@ -583,10 +583,10 @@ if (shft) { /* Shift + F1 - F10 generates F11 - F20 */ - if (keysym >= XK_F1 && keysym <= XK_F10) { + if ((keysym >= XK_F1) && (keysym <= XK_F10)) { keysym += (XK_F11 - XK_F1); shft = 0; - } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) { + } else if ((!ctrl) && (!meta) && (PrivateModes & PrivMode_ShiftKeys)) { switch (keysym) { case XK_Prior: /* Shift-PgUp scrolls up a page */ if (TermWin.saveLines) { @@ -621,7 +621,7 @@ } #ifdef UNSHIFTED_SCROLLKEYS /* Allow PgUp/PgDn by themselves to scroll. Not recommended. */ - else if (!ctrl && !meta) { + else if ((!ctrl) && (!meta)) { switch (keysym) { case XK_Prior: if (TermWin.saveLines) { @@ -670,17 +670,17 @@ /* At this point, all the keystrokes that have special meaning to us have been handled. If we're in pause mode, this is a keystroke asking us to exit. Otherwise, return here. */ if (paused) { - if (keysym && len) { + if ((keysym) && (len)) { exit(0); } LK_RET(); } /* Process extended keysyms. This is where the conversion to escape sequences happens. */ - if (keysym >= 0xff00 && keysym <= 0xffff) { + if ((keysym >= 0xff00) && (keysym <= 0xffff)) { #ifdef KEYSYM_ATTRIBUTE /* The "keysym" attribute in the config file gets handled here. */ - if (!(shft | ctrl) && KeySym_map[keysym - 0xff00]) { + if ((!(shft | ctrl)) && (KeySym_map[keysym - 0xff00])) { const unsigned char *tmpbuf; unsigned int len; @@ -689,7 +689,7 @@ len = *tmpbuf++; /* escape prefix */ - if (meta + if ((meta) # ifdef META8_OPTION && (meta_char == 033) # endif @@ -714,7 +714,7 @@ kbuf[0] = (((PrivateModes & PrivMode_BackSpace) ? !(shft | ctrl) : (shft | ctrl)) ? '\b' : '\177'); #endif #ifdef MULTI_CHARSET - if ((BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_MBYTE_CURSOR)) && scr_multi2()) { + if ((BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_MBYTE_CURSOR)) && (scr_multi2())) { memmove(kbuf + len, kbuf, len); len *= 2; } @@ -777,8 +777,8 @@ } #ifdef MULTI_CHARSET if ((BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_MBYTE_CURSOR)) - && ((keysym == XK_Left && scr_multi2()) - || (keysym == XK_Right && scr_multi1()))) { + && ((keysym == XK_Left && (scr_multi2())) + || (keysym == XK_Right && (scr_multi1())))) { memmove(kbuf + len, kbuf, len); len *= 2; } @@ -870,7 +870,7 @@ #ifdef KS_DELETE len = strlen(strcpy(kbuf, KS_DELETE)); #ifdef MULTI_CHARSET - if ((BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_MBYTE_CURSOR)) && scr_multi1()) { + if ((BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_MBYTE_CURSOR)) && (scr_multi1())) { memmove(kbuf + len, kbuf, len); len *= 2; } @@ -1003,17 +1003,17 @@ } #ifdef META8_OPTION - if (meta && (meta_char == 0x80) && len > 0) { + if ((meta) && (meta_char == 0x80) && (len > 0)) { kbuf[len - 1] |= 0x80; } #endif - } else if (ctrl && keysym == XK_minus) { + } else if ((ctrl) && (keysym == XK_minus)) { len = 1; kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ } else { #ifdef META8_OPTION /* set 8-bit on */ - if (meta && (meta_char == 0x80)) { + if ((meta) && (meta_char == 0x80)) { unsigned char *ch; @@ -1047,12 +1047,12 @@ * Ctrl+Prior = "ESC[5^" * Ctrl+Shift+Prior = "ESC[5@" */ - if (kbuf[0] == '\033' && kbuf[1] == '[' && kbuf[len - 1] == '~') { + if ((kbuf[0] == '\033') && (kbuf[1] == '[') && (kbuf[len - 1] == '~')) { kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); } /* escape prefix */ - if (meta + if ((meta) #ifdef META8_OPTION && (meta_char == 033) #endif @@ -1229,7 +1229,7 @@ int ignore = 0; ch = cmd_getc(); /* Get the next character */ - if (ch >= '<' && ch <= '?') { + if ((ch >= '<') && (ch <= '?')) { priv = ch; /* DEC private mode sequence. Get next character. */ ch = cmd_getc(); } @@ -1255,7 +1255,7 @@ ignore = 1; /* xterm ignores more than this, but we need this for vim */ if (ch < '@') ch = cmd_getc(); /* Separator. Go to next digit or operation. */ - } while (ch >= ' ' && ch < '@'); + } while ((ch >= ' ') && (ch < '@')); if (ch == 033) { cmd_ungetc(); return; @@ -1446,7 +1446,7 @@ break; case 'r': /* set top and bottom margins */ if (priv != '?') { - if (nargs < 2 || arg[0] >= arg[1]) + if ((nargs < 2) || (arg[0] >= arg[1])) scr_scroll_region(0, 10000); else scr_scroll_region(arg[0] - 1, arg[1] - 1); @@ -1460,7 +1460,7 @@ } /* drop */ case 's': - if (ch == 's' && !nargs) { + if ((ch == 's') && (!nargs)) { scr_cursor(SAVE); break; } @@ -1521,7 +1521,7 @@ if (ch == '\t') ch = ' '; /* translate '\t' to space */ else if (ch < ' ') { - if (ch == 27 && (ch = cmd_getc()) == '\\') /* ESC \ (ST) is String Terminator in Xterm */ + if ((ch == 27) && ((ch = cmd_getc()) == '\\')) /* ESC \ (ST) is String Terminator in Xterm */ break; return; /* control character - exit */ } @@ -1707,7 +1707,7 @@ switch (priv) { case 0: - if (mode && mode != 1) + if ((mode) && (mode != 1)) return; /* only do high/low */ for (i = 0; i < nargs; i++) switch (arg[i]) { @@ -1911,7 +1911,7 @@ case 38: if (arg[i + 1] == 5) { i += 2; - if (arg[i] >= 0 && arg[i] < 256) + if ((arg[i] >= 0) && (arg[i] < 256)) scr_color(arg[i], RS_Bold); } break; @@ -1934,7 +1934,7 @@ case 48: if (arg[i + 1] == 5) { i += 2; - if (arg[i] >= 0 && arg[i] < 256) + if ((arg[i] >= 0) && (arg[i] < 256)) scr_color(arg[i], RS_Blink); } break; @@ -2023,9 +2023,9 @@ colorfgbg = DEFAULT_RSTYLE; for (i = minColor; i <= maxColor; i++) { - if (PixColors[fgColor] == PixColors[i] + if ((PixColors[fgColor] == PixColors[i]) # ifndef NO_BOLDUNDERLINE - && PixColors[fgColor] == PixColors[colorBD] + && (PixColors[fgColor] == PixColors[colorBD]) # endif /* NO_BOLDUNDERLINE */ /* if we wanted boldFont to have precedence */ # if 0 /* ifndef NO_BOLDFONT */ @@ -2287,9 +2287,9 @@ FREE(iml->bmod); } # ifdef PIXMAP_OFFSET - if (image_mode_is(which, MODE_TRANS) && (desktop_pixmap != None)) { + if ((image_mode_is(which, MODE_TRANS)) && (desktop_pixmap != None)) { free_desktop_pixmap(); - } else if (image_mode_is(which, MODE_VIEWPORT) && (viewport_pixmap != None)) { + } else if ((image_mode_is(which, MODE_VIEWPORT)) && (viewport_pixmap != None)) { LIBAST_X_FREE_PIXMAP(viewport_pixmap); viewport_pixmap = None; /* Force the re-read */ } @@ -2304,9 +2304,9 @@ mod, color, get_image_type(which), valptr)); changed = 1; # ifdef PIXMAP_OFFSET - if (image_mode_is(which, MODE_TRANS) && (desktop_pixmap != None)) { + if ((image_mode_is(which, MODE_TRANS)) && (desktop_pixmap != None)) { free_desktop_pixmap(); - } else if (image_mode_is(which, MODE_VIEWPORT) && (viewport_pixmap != None)) { + } else if ((image_mode_is(which, MODE_VIEWPORT)) && (viewport_pixmap != None)) { LIBAST_X_FREE_PIXMAP(viewport_pixmap); viewport_pixmap = None; /* Force the re-read */ } @@ -2387,7 +2387,7 @@ case 2: changed = 0; which = image_max; - if (!(nstr = (char *)strsep(&tnstr, ";")) || !(valptr = (char *)strsep(&tnstr, ";"))) { + if ((!(nstr = (char *)strsep(&tnstr, ";"))) || (!(valptr = (char *)strsep(&tnstr, ";")))) { break; } FOREACH_IMAGE(if (!strcasecmp(valptr, (get_image_type(idx) + 6))) { @@ -2413,7 +2413,7 @@ iml->mod->brightness = 0x100; changed = 1; } - if (iml->mod->contrast == 0x100 && iml->mod->gamma == 0x100) { + if ((iml->mod->contrast == 0x100) && (iml->mod->gamma == 0x100)) { FREE(iml->mod); } } @@ -2442,7 +2442,7 @@ if (iml->rmod->brightness != 0x100) { iml->rmod->brightness = 0x100; changed = 1; - if (iml->rmod->contrast == 0x100 && iml->rmod->gamma == 0x100) { + if ((iml->rmod->contrast == 0x100) && (iml->rmod->gamma == 0x100)) { FREE(iml->rmod); } } @@ -2462,7 +2462,7 @@ if (iml->gmod->brightness != 0x100) { iml->gmod->brightness = 0x100; changed = 1; - if (iml->gmod->contrast == 0x100 && iml->gmod->gamma == 0x100) { + if ((iml->gmod->contrast == 0x100) && (iml->gmod->gamma == 0x100)) { FREE(iml->gmod); } } @@ -2482,7 +2482,7 @@ if (iml->bmod->brightness != 0x100) { iml->bmod->brightness = 0x100; changed = 1; - if (iml->bmod->contrast == 0x100 && iml->bmod->gamma == 0x100) { + if ((iml->bmod->contrast == 0x100) && (iml->bmod->gamma == 0x100)) { FREE(iml->bmod); } } @@ -2521,7 +2521,7 @@ #endif case 10: nstr = (char *) strsep(&tnstr, ";"); - if (nstr && *nstr) { + if ((nstr) && (*nstr)) { if (!strcasecmp(nstr, "xterm")) { #ifdef XTERM_SCROLLBAR scrollbar_change_type(SCROLLBAR_XTERM); @@ -2545,7 +2545,7 @@ } } nstr = (char *) strsep(&tnstr, ";"); - if (nstr && *nstr) { + if ((nstr) && (*nstr)) { scrollbar_change_width((unsigned short) strtoul(nstr, (char **) NULL, 0)); } break; @@ -2566,7 +2566,7 @@ break; case 14: nstr = (char *) strsep(&tnstr, ";"); - if (!(nstr) || !(*(nstr))) { + if ((!(nstr)) || (!(*(nstr)))) { bbar_show_all(-1); parent_resize(); } else if (BOOL_OPT_ISTRUE(nstr)) { @@ -2626,7 +2626,7 @@ case 40: nstr = (char *) strsep(&tnstr, ";"); if (nstr) { - if (XParseColor(Xdisplay, cmap, nstr, &xcol) && XAllocColor(Xdisplay, cmap, &xcol)) { + if ((XParseColor(Xdisplay, cmap, nstr, &xcol)) && (XAllocColor(Xdisplay, cmap, &xcol))) { PixColors[fgColor] = xcol.pixel; scr_refresh(DEFAULT_REFRESH); } @@ -2635,7 +2635,7 @@ case 41: nstr = (char *) strsep(&tnstr, ";"); if (nstr) { - if (XParseColor(Xdisplay, cmap, nstr, &xcol) && XAllocColor(Xdisplay, cmap, &xcol)) { + if ((XParseColor(Xdisplay, cmap, nstr, &xcol)) && (XAllocColor(Xdisplay, cmap, &xcol))) { PixColors[bgColor] = xcol.pixel; scr_refresh(DEFAULT_REFRESH); } @@ -2644,7 +2644,7 @@ case 50: /* Change desktops */ nstr = (char *) strsep(&tnstr, ";"); - if (nstr && *nstr) { + if ((nstr) && (*nstr)) { XClientMessageEvent xev; rs_desktop = (int) strtol(nstr, (char **) NULL, 0); @@ -2661,7 +2661,7 @@ case 51: /* Change opacity */ nstr = (char *) strsep(&tnstr, ";"); - if (nstr && *nstr) { + if ((nstr) && (*nstr)) { XClientMessageEvent xev; spif_uint32_t tmp; @@ -2687,7 +2687,7 @@ case 72: /* Search scrollback buffer for a string. NULL to clear. */ nstr = (char *) strsep(&tnstr, ";"); - if (nstr && *nstr) { + if ((nstr) && (*nstr)) { scr_search_scrollback(nstr); } else { scr_search_scrollback(NULL); @@ -2697,7 +2697,7 @@ case 80: /* Set debugging level */ nstr = (char *) strsep(&tnstr, ";"); - if (nstr && *nstr) { + if ((nstr) && (*nstr)) { DEBUG_LEVEL = (unsigned int) strtoul(nstr, (char **) NULL, 0); } break; @@ -2778,7 +2778,7 @@ bg_needs_update = 1; load_image(nstr, images[image_bg].current); } - while ((nstr = (char *) strsep(&tnstr, ";")) && *nstr) { + while ((nstr = (char *) strsep(&tnstr, ";")) && (*nstr)) { changed += set_pixmap_scale(nstr, images[image_bg].current->pmap); scaled = 1; } @@ -2813,7 +2813,7 @@ break; case ESCSEQ_XTERM_LOGFILE: /* 46 */ nstr = (char *) strsep(&tnstr, ";"); - if (nstr && *nstr && BOOL_OPT_ISTRUE(nstr)) { + if ((nstr) && (*nstr) && (BOOL_OPT_ISTRUE(nstr))) { /* Logging on */ } else { /* Logging off */ Index: eterm/Eterm/src/grkelot.c =================================================================== --- eterm/Eterm/src/grkelot.c (revision 51690) +++ eterm/Eterm/src/grkelot.c (working copy) @@ -196,7 +196,7 @@ kstate_setcurr(i); kstate_init(); } - if (greek_mode < 0 || greek_mode >= NUM_XLAT_TYPES) /* avoid death */ + if ((greek_mode < 0) || (greek_mode >= NUM_XLAT_TYPES)) /* avoid death */ greek_mode = GREEK_ELOT928; xlat_now = &xlat_type[greek_mode]; kstate_setcurr(0); @@ -310,15 +310,15 @@ /* check for ascii switcher */ for (i = 0; i < pStateNow->num_switcher; i++) - if (pStateNow->switcher[i].type == 'A' && /* only ascii here */ - c == pStateNow->switcher[i].code) { + if ((pStateNow->switcher[i].type == 'A') && /* only ascii here */ + (c == pStateNow->switcher[i].code)) { kstate_setcurr(pStateNow->switcher[i].nextstate); pStateNow->switcher[i].on = 1; return ((unsigned int) -1); } /* do translation */ for (i = 0; i < pStateNow->num_xlat; i++) - if (c >= pStateNow->xlat[i].first && c <= pStateNow->xlat[i].last) { + if ((c >= pStateNow->xlat[i].first) && (c <= pStateNow->xlat[i].last)) { c = pStateNow->xlat[i].pval[c - pStateNow->xlat[i].first]; break; } Index: eterm/Eterm/src/screen.c =================================================================== --- eterm/Eterm/src/screen.c (revision 51690) +++ eterm/Eterm/src/screen.c (working copy) @@ -144,7 +144,7 @@ TermWin.view_start = 0; RESET_CHSTAT; - if (TERM_WINDOW_GET_REPORTED_COLS() == prev_ncol && TERM_WINDOW_GET_REPORTED_ROWS() == prev_nrow) + if ((TERM_WINDOW_GET_REPORTED_COLS() == prev_ncol) && (TERM_WINDOW_GET_REPORTED_ROWS() == prev_nrow)) return; if (current_screen != PRIMARY) { @@ -437,7 +437,7 @@ #if NSCREENS if (BITFIELD_IS_SET(vt_options, VT_OPTIONS_SECONDARY_SCREEN)) { offset = TermWin.saveLines; - if (!screen.text || !screen.rend) + if ((!screen.text) || (!screen.rend)) return (current_screen); for (i = TERM_WINDOW_GET_REPORTED_ROWS(); i--;) { SWAP_IT(screen.text[i + offset], swap.text[i], t0); @@ -501,7 +501,7 @@ } break; } - } else if (!(rstyle & Intensity) && ((int) color >= minBright) && (color <= maxBright)) { + } else if ((!(rstyle & Intensity)) && ((int) color >= minBright) && (color <= maxBright)) { switch (Intensity) { case RS_Bold: if (BITFIELD_IS_SET(vt_options, VT_OPTIONS_BOLD_BRIGHTENS_FOREGROUND)) { @@ -568,7 +568,7 @@ break; case RS_Bold: color = GET_FGCOLOR(rstyle); - if (color >= minBright && color <= maxBright) { + if ((color >= minBright) && (color <= maxBright)) { scr_color(color, RS_Bold); if ((rstyle & RS_fgMask) == (colorfgbg & RS_fgMask)) scr_color(restoreFG, RS_Bold); @@ -576,7 +576,7 @@ break; case RS_Blink: color = GET_BGCOLOR(rstyle); - if (color >= minBright && color <= maxBright) { + if ((color >= minBright) && (color <= maxBright)) { scr_color(color, RS_Blink); if ((rstyle & RS_bgMask) == (colorfgbg & RS_bgMask)) scr_color(restoreBG, RS_Blink); @@ -595,7 +595,7 @@ PROF_INIT(scroll_text); D_SCREEN(("scroll_text(%d,%d,%d,%d): %s\n", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); - if (count == 0 || (row1 > row2)) + if ((count == 0) || (row1 > row2)) return 0; if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) { TermWin.nscrolled += count; @@ -604,18 +604,18 @@ row1 += TermWin.saveLines; row2 += TermWin.saveLines; - if (selection.op && current_screen == selection.screen) { + if ((selection.op) && (current_screen == selection.screen)) { i = selection.beg.row + TermWin.saveLines; j = selection.end.row + TermWin.saveLines; - if ((i < row1 && j > row1) - || (i < row2 && j > row2) - || (i - count < row1 && i >= row1) - || (i - count > row2 && i <= row2) - || (j - count < row1 && j >= row1) - || (j - count > row2 && j <= row2)) { + if (((i < row1) && (j > row1)) + || ((i < row2) && (j > row2)) + || ((i - count < row1) && (i >= row1)) + || ((i - count > row2) && (i <= row2)) + || ((j - count < row1) && (j >= row1)) + || ((j - count > row2) && (j <= row2))) { CLEAR_ALL_SELECTION; selection.op = SELECTION_CLEAR; - } else if (j >= row1 && j <= row2) { + } else if ((j >= row1) && (j <= row2)) { /* move selected region too */ selection.beg.row -= count; selection.end.row -= count; @@ -716,7 +716,7 @@ if ((nlines > 0) && (screen.tscroll == 0) && (screen.bscroll == (TERM_WINDOW_GET_REPORTED_ROWS() - 1))) { /* _at least_ this many lines need to be scrolled */ scroll_text(screen.tscroll, screen.bscroll, nlines, 0); - for (i = nlines, row = screen.bscroll + TermWin.saveLines + 1; row > 0 && i--;) { + for (i = nlines, row = screen.bscroll + TermWin.saveLines + 1; (row > 0) && (i--);) { /* Move row-- to beginning of loop to avoid segfault. -- added by Sebastien van K */ row--; blank_screen_mem(screen.text, screen.rend, row, rstyle); @@ -737,8 +737,8 @@ srp = screen.rend[row]; #ifdef MULTI_CHARSET - if (lost_multi && screen.col > 0 && ((srp[screen.col - 1] & RS_multiMask) == RS_multi1) - && *str != '\n' && *str != '\r' && *str != '\t') + if ((lost_multi) && (screen.col > 0) && ((srp[screen.col - 1] & RS_multiMask) == RS_multi1) + && (*str != '\n') && (*str != '\r') && (*str != '\t')) chstat = WBYTE; #endif @@ -752,7 +752,7 @@ c |= 0x80; /* maybe overkill, but makes it selectable */ } } else if (chstat == SBYTE) { - if ((encoding_method != LATIN1) && (multi_byte || (c & 0x80))) { /* multibyte 1st byte */ + if ((encoding_method != LATIN1) && ((multi_byte) || (c & 0x80))) { /* multibyte 1st byte */ rstyle &= ~RS_multiMask; rstyle |= RS_multi1; chstat = WBYTE; @@ -835,9 +835,9 @@ end.row = screen.row; } if (((selection.end.row > beg.row) - || (selection.end.row == beg.row && selection.end.col >= beg.col)) + || (selection.end.row == beg.row && (selection.end.col >= beg.col))) && ((selection.beg.row < end.row) - || (selection.beg.row == end.row && selection.beg.col <= end.col))) + || (selection.beg.row == end.row && (selection.beg.col <= end.col)))) selection_reset(); #ifdef ESCREEN @@ -858,7 +858,7 @@ { RESET_CHSTAT; - if (screen.col == 0 && screen.row > 0) { + if ((screen.col == 0) && (screen.row > 0)) { screen.col = TERM_WINDOW_GET_REPORTED_COLS() - 1; screen.row--; } else if (screen.flags & Screen_WrapNext) { @@ -919,12 +919,12 @@ } if (relative & R_RELATIVE) { if (row > 0) { - if (screen.row <= screen.bscroll && (screen.row + row) > screen.bscroll) + if ((screen.row <= screen.bscroll) && ((screen.row + row) > screen.bscroll)) screen.row = screen.bscroll; else screen.row += row; } else if (row < 0) { - if (screen.row >= screen.tscroll && (screen.row + row) < screen.tscroll) + if ((screen.row >= screen.tscroll) && ((screen.row + row) < screen.tscroll)) screen.row = screen.tscroll; else screen.row += row; @@ -965,8 +965,8 @@ if (screen.flags & Screen_WrapNext) { screen.flags &= ~Screen_WrapNext; } - if ((screen.row == screen.bscroll && direction == UP) - || (screen.row == screen.tscroll && direction == DN)) { + if (((screen.row == screen.bscroll) && (direction == UP)) + || ((screen.row == screen.tscroll) && (direction == DN))) { scro