[Xfce4-commits] <squeeze:master> Use explicit comparisons in archive-command.c, internals.c and command-option.c
Stephan Arts
noreply at xfce.org
Wed Aug 24 21:40:01 CEST 2011
Updating branch refs/heads/master
to fd437a3d47a91f82b1562fa9328fcdfbdcd2a6be (commit)
from c85322c147e9436ed497d5f1da544a6fe6ce72a1 (commit)
commit fd437a3d47a91f82b1562fa9328fcdfbdcd2a6be
Author: Stephan Arts <stephan at xfce.org>
Date: Wed Aug 24 21:38:25 2011 +0200
Use explicit comparisons in archive-command.c, internals.c and command-option.c
libsqueeze/archive-command.c | 18 +++++++++++-------
libsqueeze/archive.c | 16 ++++++++--------
libsqueeze/command-option.c | 26 ++++++++++++++------------
libsqueeze/internals.c | 6 +++---
4 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/libsqueeze/archive-command.c b/libsqueeze/archive-command.c
index 11e87ee..230efb9 100644
--- a/libsqueeze/archive-command.c
+++ b/libsqueeze/archive-command.c
@@ -116,7 +116,7 @@ lsq_archive_command_dispose(GObject *object)
{
LSQArchiveCommand *command = LSQ_ARCHIVE_COMMAND(object);
g_signal_emit(object, lsq_archive_command_signals[LSQ_ARCHIVE_COMMAND_SIGNAL_TERMINATED], 0, command->error, NULL);
- if(command->archive)
+ if ( NULL != command->archive )
{
g_object_unref(command->archive);
command->archive = NULL;
@@ -134,8 +134,10 @@ static void
lsq_archive_command_finalize(GObject *object)
{
LSQArchiveCommand *command = LSQ_ARCHIVE_COMMAND(object);
- if(command->error)
+ if ( NULL != command->error )
+ {
g_error_free(command->error);
+ }
}
@@ -149,8 +151,8 @@ gboolean
lsq_archive_command_execute(LSQArchiveCommand *command)
{
#ifdef DEBUG
- g_return_val_if_fail(command->archive, FALSE);
- g_return_val_if_fail(LSQ_IS_ARCHIVE(command->archive), FALSE);
+ g_return_val_if_fail ( NULL != command->archive, FALSE );
+ g_return_val_if_fail ( LSQ_IS_ARCHIVE(command->archive), FALSE );
#endif /* DEBUG */
return command->execute(command);
@@ -202,16 +204,18 @@ lsq_archive_command_new(const gchar *comment,
LSQArchiveCommand *archive_command;
#ifdef DEBUG
- g_return_val_if_fail(archive, NULL);
- g_return_val_if_fail(LSQ_IS_ARCHIVE(archive), NULL);
+ g_return_val_if_fail ( NULL != archive, NULL );
+ g_return_val_if_fail ( LSQ_IS_ARCHIVE(archive), NULL );
#endif
archive_command = g_object_new(LSQ_TYPE_ARCHIVE_COMMAND, NULL);
g_object_ref(G_OBJECT(archive));
archive_command->archive = archive;
- if(comment)
+ if ( NULL != comment )
+ {
archive_command->comment = g_strdup(comment);
+ }
archive_command->execute = exec_command;
diff --git a/libsqueeze/archive.c b/libsqueeze/archive.c
index bc5770e..a2dcd7e 100644
--- a/libsqueeze/archive.c
+++ b/libsqueeze/archive.c
@@ -134,7 +134,7 @@ static void
lsq_archive_finalize(GObject *object)
{
LSQArchive *archive;
- g_return_if_fail(LSQ_IS_ARCHIVE(object));
+ g_return_if_fail ( LSQ_IS_ARCHIVE(object) );
archive = (LSQArchive *)(object);
lsq_archive_free_iter(archive);
@@ -182,7 +182,7 @@ lsq_archive_new (GFile *file)
g_debug("mime: %s\n", archive->priv->content_type);
#endif
- for (iter = lsq_mime_support_list; NULL != iter; iter = iter->next)
+ for ( iter = lsq_mime_support_list; NULL != iter; iter = iter->next )
{
if ( 0 == strcmp(((LSQSupportTemplate*)iter->data)->content_type, archive->priv->content_type) )
{
@@ -216,7 +216,7 @@ guint
lsq_archive_n_entry_properties(const LSQArchive *archive)
{
#ifdef DEBUG
- g_return_val_if_fail(archive, 0);
+ g_return_val_if_fail ( NULL != archive, 0 );
#endif
return lsq_support_template_get_n_properties(archive->priv->s_template) + LSQ_ARCHIVE_PROP_USER;
}
@@ -249,7 +249,7 @@ lsq_archive_get_entry_property_offset(const LSQArchive *archive, guint n)
{
case LSQ_ARCHIVE_PROP_FILENAME:
case LSQ_ARCHIVE_PROP_MIME_TYPE:
- g_return_val_if_reached(0);
+ g_return_val_if_reached ( 0 );
break;
default:
return lsq_support_template_get_property_offset(archive->priv->s_template, n - LSQ_ARCHIVE_PROP_USER);
@@ -283,7 +283,7 @@ guint
lsq_archive_entry_properties_size(const LSQArchive *archive)
{
#ifdef DEBUG
- g_return_val_if_fail(archive, 0);
+ g_return_val_if_fail ( NULL != archive, 0 );
#endif
return lsq_support_template_get_properties_size(archive->priv->s_template);
}
@@ -328,10 +328,10 @@ lsq_archive_refreshed(const LSQArchive *archive)
void lsq_archive_add_children(GSList *files)
{
GSList *iter;
- for(iter = files; NULL != iter; iter = iter->next)
+ for ( iter = files; NULL != iter; iter = iter->next )
{
unsigned int i, size = lsq_archive_iter_n_children(iter->data);
- for(i = 0; i < size; ++i)
+ for ( i = 0; i < size; ++i )
{
files = g_slist_append(iter, lsq_archive_iter_nth_child(iter->data, i));
}
@@ -406,7 +406,7 @@ lsq_archive_operate(LSQArchive *archive, LSQCommandType type, const gchar **file
{
LSQSupportTemplate *s_template;
- g_return_val_if_fail(archive, FALSE);
+ g_return_val_if_fail ( NULL != archive, FALSE );
s_template = archive->priv->s_template;
diff --git a/libsqueeze/command-option.c b/libsqueeze/command-option.c
index a5f12e8..c1e7e19 100644
--- a/libsqueeze/command-option.c
+++ b/libsqueeze/command-option.c
@@ -49,7 +49,7 @@ lsq_command_option_get_type(gint type_idx)
{
static GType lsq_command_option_type[5] = {0};
- if (!lsq_command_option_type[0])
+ if ( G_TYPE_INVALID == lsq_command_option_type[0] )
{
static const GTypeFundamentalInfo lsq_command_option_fund =
{
@@ -141,20 +141,20 @@ lsq_command_option_create_list(XfceRc *rc, gchar **option_names)
xfce_rc_set_group(rc, option_group);
type = xfce_rc_read_entry(rc, "X-Squeeze-Type", "");
- if(0==g_ascii_strcasecmp("Bool", type))
+ if ( 0 == g_ascii_strcasecmp("Bool", type) )
{
*cmd_opt_iter = LSQ_COMMAND_OPTION(g_type_create_instance(LSQ_TYPE_COMMAND_OPTION_BOOL));
(*cmd_opt_iter)->value_type = G_TYPE_BOOLEAN;
LSQ_COMMAND_OPTION_BOOL(*cmd_opt_iter)->default_value = xfce_rc_read_bool_entry(rc, "X-Squeeze-Value", FALSE);
}
- else if(0==g_ascii_strcasecmp("String", type))
+ else if ( 0 == g_ascii_strcasecmp("String", type) )
{
*cmd_opt_iter = LSQ_COMMAND_OPTION(g_type_create_instance(LSQ_TYPE_COMMAND_OPTION_STRING));
(*cmd_opt_iter)->value_type = G_TYPE_STRING;
LSQ_COMMAND_OPTION_STRING(*cmd_opt_iter)->default_value = xfce_rc_read_entry(rc, "X-Squeeze-Value", NULL);
LSQ_COMMAND_OPTION_STRING(*cmd_opt_iter)->filter = xfce_rc_read_entry(rc, "X-Squeeze-Filter", NULL);
}
- else if(0==g_ascii_strcasecmp("Int", type))
+ else if ( 0 == g_ascii_strcasecmp("Int", type) )
{
*cmd_opt_iter = LSQ_COMMAND_OPTION(g_type_create_instance(LSQ_TYPE_COMMAND_OPTION_INT));
(*cmd_opt_iter)->value_type = G_TYPE_INT;
@@ -162,7 +162,7 @@ lsq_command_option_create_list(XfceRc *rc, gchar **option_names)
LSQ_COMMAND_OPTION_INT(*cmd_opt_iter)->min_value = xfce_rc_read_int_entry(rc, "X-Squeeze-Min", 0);
LSQ_COMMAND_OPTION_INT(*cmd_opt_iter)->max_value = xfce_rc_read_int_entry(rc, "X-Squeeze-Max", 0);
}
- else if(0==g_ascii_strcasecmp("Uint", type))
+ else if ( 0 == g_ascii_strcasecmp("Uint", type) )
{
*cmd_opt_iter = LSQ_COMMAND_OPTION(g_type_create_instance(LSQ_TYPE_COMMAND_OPTION_UINT));
(*cmd_opt_iter)->value_type = G_TYPE_UINT;
@@ -193,10 +193,10 @@ lsq_command_option_create_pair(LSQCommandOption **option_list)
LSQCommandOptionPair **option_pair;
LSQCommandOptionPair **pair_iter;
- g_return_val_if_fail (NULL != option_list, NULL);
+ g_return_val_if_fail ( NULL != option_list, NULL);
- for(option_iter = option_list; *option_iter; option_iter++)
+ for ( option_iter = option_list; NULL != *option_iter; option_iter++ )
{
length++;
}
@@ -204,7 +204,7 @@ lsq_command_option_create_pair(LSQCommandOption **option_list)
option_pair = g_new0(LSQCommandOptionPair*, length);
pair_iter = option_pair;
- for(option_iter = option_list; *option_iter; option_iter++)
+ for ( option_iter = option_list; NULL != *option_iter; option_iter++ )
{
LSQCommandOption *option = *option_iter;
@@ -227,7 +227,7 @@ lsq_command_option_pair_get_args(LSQCommandOptionPair **pair)
LSQCommandOptionPair **option_iter;
gchar **argv, **argi;
- for(option_iter = pair; *option_iter; option_iter++)
+ for ( option_iter = pair; NULL != *option_iter; option_iter++ )
{
length += lsq_command_option_get_args((*option_iter)->option, &(*option_iter)->value, NULL);
}
@@ -235,7 +235,7 @@ lsq_command_option_pair_get_args(LSQCommandOptionPair **pair)
argv = g_new0(gchar*, length+1);
argi = argv;
- for(option_iter = pair; *option_iter; option_iter++)
+ for ( option_iter = pair; NULL != *option_iter; option_iter++ )
{
argi += lsq_command_option_get_args((*option_iter)->option, &(*option_iter)->value, argi);
}
@@ -253,7 +253,7 @@ lsq_command_option_get_args(const LSQCommandOption *option, GValue *value, gchar
void
lsq_command_option_get_default(const LSQCommandOption *option, GValue *value)
{
- g_return_if_fail(LSQ_COMMAND_OPTION_GET_CLASS(option)->get_default);
+ g_return_if_fail ( NULL != LSQ_COMMAND_OPTION_GET_CLASS(option)->get_default );
LSQ_COMMAND_OPTION_GET_CLASS(option)->get_default(option, value);
}
@@ -264,8 +264,10 @@ static void lsq_command_option_bool_get_default(const LSQCommandOptionBool *opti
static void lsq_command_option_string_get_default(const LSQCommandOptionString *option, GValue *value)
{
- if(option->default_value)
+ if ( NULL != option->default_value )
+ {
g_value_set_string(value, option->default_value);
+ }
// else
// g_value_unset(value);
}
diff --git a/libsqueeze/internals.c b/libsqueeze/internals.c
index 06d4476..17bb6d3 100644
--- a/libsqueeze/internals.c
+++ b/libsqueeze/internals.c
@@ -61,7 +61,7 @@ LSQArchive *
lsq_opened_archive_get_archive(gchar *path)
{
GSList *result = g_slist_find_custom(lsq_opened_archive_list, path, lsq_opened_archives_lookup_archive);
- if(result)
+ if ( NULL != result )
{
g_object_ref(result->data);
return result->data;
@@ -75,11 +75,11 @@ lsq_opened_archives_lookup_archive(gconstpointer open_archive, gconstpointer uri
{
GFile *file;
#ifdef DEBUG
- g_return_val_if_fail(open_archive, 1);
+ g_return_val_if_fail ( NULL != open_archive, 1 );
#endif
file = g_file_new_for_path (uri);
- if(g_file_equal (lsq_archive_get_file(LSQ_ARCHIVE(open_archive)), file))
+ if ( TRUE == g_file_equal ( lsq_archive_get_file ( LSQ_ARCHIVE(open_archive) ), file) )
{
g_object_unref (file);
return 0;
More information about the Xfce4-commits
mailing list