No need to initialize private struct members to 0
authorPhilip Chimento <philip.chimento@gmail.com>
Wed, 21 Aug 2013 01:57:36 +0000 (18:57 -0700)
committerPhilip Chimento <philip.chimento@gmail.com>
Mon, 9 Sep 2013 04:12:00 +0000 (21:12 -0700)
At the beginning of the class init function, the entire private
struct is filled with 0 bytes.

libchimara/chimara-glk.c
libchimara/chimara-if.c

index 958215970e553178497d1c754d314049a891ed92..584401763ba98cc00b933bbee11c3338ed94245a 100644 (file)
@@ -158,46 +158,24 @@ chimara_glk_init(ChimaraGlk *self)
     
     priv->self = self;
     priv->interactive = TRUE;
-    priv->protect = FALSE;
        priv->styles = g_new0(StyleSet,1);
        priv->glk_styles = g_new0(StyleSet,1);
        priv->final_message = g_strdup("[ The game has finished ]");
-       priv->running = FALSE;
-    priv->program = NULL;
-    priv->thread = NULL;
     priv->event_queue = g_queue_new();
     priv->event_lock = g_mutex_new();
     priv->event_queue_not_empty = g_cond_new();
     priv->event_queue_not_full = g_cond_new();
     priv->abort_lock = g_mutex_new();
-    priv->abort_signalled = FALSE;
        priv->shutdown_lock = g_mutex_new();
        priv->shutdown_key_pressed = g_cond_new();
        priv->arrange_lock = g_mutex_new();
        priv->rearranged = g_cond_new();
-       priv->needs_rearrange = FALSE;
-       priv->ignore_next_arrange_event = FALSE;
        priv->char_input_queue = g_async_queue_new();
        priv->line_input_queue = g_async_queue_new();
        /* FIXME Should be g_async_queue_new_full(g_free); but only in GTK >= 2.16 */
-       priv->resource_map = NULL;
        priv->resource_lock = g_mutex_new();
        priv->resource_loaded = g_cond_new();
        priv->resource_info_available = g_cond_new();
-       priv->resource_load_callback = NULL;
-       priv->resource_load_callback_data = NULL;
-       priv->image_cache = NULL;
-       priv->program_name = NULL;
-       priv->program_info = NULL;
-       priv->story_name = NULL;
-       priv->interrupt_handler = NULL;
-    priv->root_window = NULL;
-    priv->fileref_list = NULL;
-    priv->current_stream = NULL;
-    priv->stream_list = NULL;
-       priv->timer_id = 0;
-       priv->in_startup = FALSE;
-       priv->current_dir = NULL;
 
        style_init(self);
 }
index 0554d93fc3530a6ea190034e972de3cdafcbfbf3..746bab0fd2512d3dbb22cc308e6c92e6fb0c4705 100644 (file)
@@ -172,9 +172,6 @@ chimara_if_init(ChimaraIF *self)
        priv->interpreter = CHIMARA_IF_INTERPRETER_NONE;
        priv->flags = CHIMARA_IF_TYPO_CORRECTION;
        priv->interpreter_number = CHIMARA_IF_ZMACHINE_DEFAULT;
-       priv->random_seed_set = FALSE;
-       priv->graphics_file = NULL;
-       priv->input = NULL;
        priv->response = g_string_new("");
 
        /* Connect to signals of ChimaraGlk parent */