From 45a2156c12bbb4087d2ad957fca442e2c45b27a6 Mon Sep 17 00:00:00 2001 From: o9000 Date: Tue, 20 Jan 2015 02:23:28 +0000 Subject: [PATCH] Cleanup whitespace git-svn-id: http://tint2.googlecode.com/svn/trunk@655 121b4492-b84c-0410-8b4c-0d4edfb3f3cc --- src/launcher/xsettings-client.c | 10 +- src/launcher/xsettings-common.c | 326 ++++++++++++++++---------------- src/tint2conf/main.c | 4 +- 3 files changed, 170 insertions(+), 170 deletions(-) diff --git a/src/launcher/xsettings-client.c b/src/launcher/xsettings-client.c index a66c4b7..f7f7eb0 100644 --- a/src/launcher/xsettings-client.c +++ b/src/launcher/xsettings-client.c @@ -169,13 +169,13 @@ static XSettingsResult fetch_card32 (XSettingsBuffer *buffer, CARD32 *result) static XSettingsResult fetch_card8 (XSettingsBuffer *buffer, CARD8 *result) { - if (BYTES_LEFT (buffer) < 1) - return XSETTINGS_ACCESS; + if (BYTES_LEFT (buffer) < 1) + return XSETTINGS_ACCESS; - *result = *(CARD8 *)buffer->pos; - buffer->pos += 1; + *result = *(CARD8 *)buffer->pos; + buffer->pos += 1; - return XSETTINGS_SUCCESS; + return XSETTINGS_SUCCESS; } #define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1))) diff --git a/src/launcher/xsettings-common.c b/src/launcher/xsettings-common.c index 1b2125f..9fe5011 100644 --- a/src/launcher/xsettings-common.c +++ b/src/launcher/xsettings-common.c @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Owen Taylor, Red Hat, Inc. @@ -31,238 +31,238 @@ XSettingsSetting * xsettings_setting_copy (XSettingsSetting *setting) { - XSettingsSetting *result; - size_t str_len; - - result = malloc (sizeof *result); - if (!result) - return NULL; + XSettingsSetting *result; + size_t str_len; - str_len = strlen (setting->name); - result->name = malloc (str_len + 1); - if (!result->name) - goto err; + result = malloc (sizeof *result); + if (!result) + return NULL; - memcpy (result->name, setting->name, str_len + 1); + str_len = strlen (setting->name); + result->name = malloc (str_len + 1); + if (!result->name) + goto err; - result->type = setting->type; + memcpy (result->name, setting->name, str_len + 1); - switch (setting->type) - { - case XSETTINGS_TYPE_INT: - result->data.v_int = setting->data.v_int; - break; - case XSETTINGS_TYPE_COLOR: - result->data.v_color = setting->data.v_color; - break; - case XSETTINGS_TYPE_STRING: - str_len = strlen (setting->data.v_string); - result->data.v_string = malloc (str_len + 1); - if (!result->data.v_string) - goto err; + result->type = setting->type; - memcpy (result->data.v_string, setting->data.v_string, str_len + 1); - break; - default: - break; - } + switch (setting->type) + { + case XSETTINGS_TYPE_INT: + result->data.v_int = setting->data.v_int; + break; + case XSETTINGS_TYPE_COLOR: + result->data.v_color = setting->data.v_color; + break; + case XSETTINGS_TYPE_STRING: + str_len = strlen (setting->data.v_string); + result->data.v_string = malloc (str_len + 1); + if (!result->data.v_string) + goto err; - result->last_change_serial = setting->last_change_serial; + memcpy (result->data.v_string, setting->data.v_string, str_len + 1); + break; + default: + break; + } - return result; + result->last_change_serial = setting->last_change_serial; - err: - if (result->name) - free (result->name); - free (result); - - return NULL; + return result; + +err: + if (result->name) + free (result->name); + free (result); + + return NULL; } XSettingsList * xsettings_list_copy (XSettingsList *list) { - XSettingsList *new = NULL; - XSettingsList *old_iter = list; - XSettingsList *new_iter = NULL; + XSettingsList *new = NULL; + XSettingsList *old_iter = list; + XSettingsList *new_iter = NULL; - while (old_iter) - { - XSettingsList *new_node; - - new_node = malloc (sizeof *new_node); - if (!new_node) - goto error; - - new_node->setting = xsettings_setting_copy (old_iter->setting); - if (!new_node->setting) + while (old_iter) { - free (new_node); - goto error; + XSettingsList *new_node; + + new_node = malloc (sizeof *new_node); + if (!new_node) + goto error; + + new_node->setting = xsettings_setting_copy (old_iter->setting); + if (!new_node->setting) + { + free (new_node); + goto error; + } + + if (new_iter) + new_iter->next = new_node; + else + new = new_node; + + new_iter = new_node; + + old_iter = old_iter->next; } - if (new_iter) - new_iter->next = new_node; - else - new = new_node; + return new; - new_iter = new_node; - - old_iter = old_iter->next; - } - - return new; - - error: - xsettings_list_free (new); - return NULL; +error: + xsettings_list_free (new); + return NULL; } int xsettings_setting_equal (XSettingsSetting *setting_a, - XSettingsSetting *setting_b) + XSettingsSetting *setting_b) { - if (setting_a->type != setting_b->type) - return 0; + if (setting_a->type != setting_b->type) + return 0; - if (strcmp (setting_a->name, setting_b->name) != 0) - return 0; + if (strcmp (setting_a->name, setting_b->name) != 0) + return 0; - switch (setting_a->type) - { - case XSETTINGS_TYPE_INT: - return setting_a->data.v_int == setting_b->data.v_int; - case XSETTINGS_TYPE_COLOR: - return (setting_a->data.v_color.red == setting_b->data.v_color.red && - setting_a->data.v_color.green == setting_b->data.v_color.green && - setting_a->data.v_color.blue == setting_b->data.v_color.blue && - setting_a->data.v_color.alpha == setting_b->data.v_color.alpha); - case XSETTINGS_TYPE_STRING: - return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0; - default: - break; - } + switch (setting_a->type) + { + case XSETTINGS_TYPE_INT: + return setting_a->data.v_int == setting_b->data.v_int; + case XSETTINGS_TYPE_COLOR: + return (setting_a->data.v_color.red == setting_b->data.v_color.red && + setting_a->data.v_color.green == setting_b->data.v_color.green && + setting_a->data.v_color.blue == setting_b->data.v_color.blue && + setting_a->data.v_color.alpha == setting_b->data.v_color.alpha); + case XSETTINGS_TYPE_STRING: + return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0; + default: + break; + } - return 0; + return 0; } void xsettings_setting_free (XSettingsSetting *setting) { - if (setting->type == XSETTINGS_TYPE_STRING) - free (setting->data.v_string); + if (setting->type == XSETTINGS_TYPE_STRING) + free (setting->data.v_string); - if (setting->name) - free (setting->name); - - free (setting); + if (setting->name) + free (setting->name); + + free (setting); } void xsettings_list_free (XSettingsList *list) { - while (list) - { - XSettingsList *next = list->next; + while (list) + { + XSettingsList *next = list->next; - xsettings_setting_free (list->setting); - free (list); + xsettings_setting_free (list->setting); + free (list); - list = next; - } + list = next; + } } XSettingsResult xsettings_list_insert (XSettingsList **list, - XSettingsSetting *setting) + XSettingsSetting *setting) { - XSettingsList *node; - XSettingsList *iter; - XSettingsList *last = NULL; + XSettingsList *node; + XSettingsList *iter; + XSettingsList *last = NULL; - node = malloc (sizeof *node); - if (!node) - return XSETTINGS_NO_MEM; - node->setting = setting; + node = malloc (sizeof *node); + if (!node) + return XSETTINGS_NO_MEM; + node->setting = setting; - iter = *list; - while (iter) - { - int cmp = strcmp (setting->name, iter->setting->name); - - if (cmp < 0) - break; - else if (cmp == 0) + iter = *list; + while (iter) { - free (node); - return XSETTINGS_DUPLICATE_ENTRY; + int cmp = strcmp (setting->name, iter->setting->name); + + if (cmp < 0) + break; + else if (cmp == 0) + { + free (node); + return XSETTINGS_DUPLICATE_ENTRY; + } + + last = iter; + iter = iter->next; } - last = iter; - iter = iter->next; - } - - if (last) - last->next = node; - else - *list = node; - - node->next = iter; - - return XSETTINGS_SUCCESS; + if (last) + last->next = node; + else + *list = node; + + node->next = iter; + + return XSETTINGS_SUCCESS; } XSettingsResult xsettings_list_delete (XSettingsList **list, - const char *name) + const char *name) { - XSettingsList *iter; - XSettingsList *last = NULL; + XSettingsList *iter; + XSettingsList *last = NULL; - iter = *list; - while (iter) - { - if (strcmp (name, iter->setting->name) == 0) + iter = *list; + while (iter) { - if (last) - last->next = iter->next; - else - *list = iter->next; - - xsettings_setting_free (iter->setting); - free (iter); + if (strcmp (name, iter->setting->name) == 0) + { + if (last) + last->next = iter->next; + else + *list = iter->next; - return XSETTINGS_SUCCESS; + xsettings_setting_free (iter->setting); + free (iter); + + return XSETTINGS_SUCCESS; + } + + last = iter; + iter = iter->next; } - last = iter; - iter = iter->next; - } - - return XSETTINGS_FAILED; + return XSETTINGS_FAILED; } XSettingsSetting * xsettings_list_lookup (XSettingsList *list, - const char *name) + const char *name) { - XSettingsList *iter; + XSettingsList *iter; - iter = list; - while (iter) - { - if (strcmp (name, iter->setting->name) == 0) - return iter->setting; + iter = list; + while (iter) + { + if (strcmp (name, iter->setting->name) == 0) + return iter->setting; - iter = iter->next; - } + iter = iter->next; + } - return NULL; + return NULL; } char xsettings_byte_order (void) { - CARD32 myint = 0x01020304; - return (*(char *)&myint == 1) ? MSBFirst : LSBFirst; + CARD32 myint = 0x01020304; + return (*(char *)&myint == 1) ? MSBFirst : LSBFirst; } diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index ee5fa71..2339f11 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -18,7 +18,7 @@ **************************************************************************/ #ifdef HAVE_VERSION_H - #include "version.h" +#include "version.h" #endif #include "main.h" #include "common.h" @@ -368,7 +368,7 @@ static void menuQuit() if (g_cmd_property) g_free(g_cmd_property); - gtk_main_quit (); + gtk_main_quit (); }