From f976f776e5a00150a0b572bb5125c206c1b731e8 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Wed, 28 Mar 2012 16:15:05 -0400 Subject: [PATCH] Make marco happy. NULLs now completely fill the struct initialization so as to leave no doubt that values are being uninitialized. --- settings.c | 120 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/settings.c b/settings.c index d16f364..ab3378a 100644 --- a/settings.c +++ b/settings.c @@ -293,64 +293,64 @@ struct special s_referer = { }; struct settings rs[] = { - { "allow_volatile_cookies", XT_S_INT, 0, &allow_volatile_cookies, NULL, NULL }, - { "append_next", XT_S_INT, 0, &append_next, NULL, NULL }, - { "autofocus_onload", XT_S_INT, 0, &autofocus_onload, NULL, NULL }, - { "browser_mode", XT_S_INT, 0, NULL, NULL,&s_browser_mode }, - { "gui_mode", XT_S_INT, 0, NULL, NULL,&s_gui_mode }, - { "color_visited_uris", XT_S_INT, 0, &color_visited_uris, NULL, NULL }, + { "allow_volatile_cookies", XT_S_INT, 0, &allow_volatile_cookies, NULL, NULL, NULL, NULL}, + { "append_next", XT_S_INT, 0, &append_next, NULL, NULL, NULL, NULL }, + { "autofocus_onload", XT_S_INT, 0, &autofocus_onload, NULL, NULL, NULL, NULL}, + { "browser_mode", XT_S_INT, 0, NULL, NULL,&s_browser_mode, NULL, NULL }, + { "gui_mode", XT_S_INT, 0, NULL, NULL,&s_gui_mode, NULL, NULL }, + { "color_visited_uris", XT_S_INT, 0, &color_visited_uris , NULL, NULL, NULL, NULL }, { "cookie_policy", XT_S_INT, 0, NULL, NULL,&s_cookie }, { "cookies_enabled", XT_S_INT, 0, &cookies_enabled, NULL, NULL }, - { "ctrl_click_focus", XT_S_INT, 0, &ctrl_click_focus, NULL, NULL }, - { "default_zoom_level", XT_S_FLOAT, 0, NULL, NULL, NULL, &default_zoom_level }, - { "default_script", XT_S_STR, 0, NULL, NULL,&s_default_script }, - { "download_dir", XT_S_STR, 0, NULL, NULL,&s_download_dir }, + { "ctrl_click_focus", XT_S_INT, 0, &ctrl_click_focus, NULL, NULL, NULL, NULL }, + { "default_zoom_level", XT_S_FLOAT, 0, NULL, NULL, NULL, &default_zoom_level, NULL }, + { "default_script", XT_S_STR, 0, NULL, NULL,&s_default_script, NULL, NULL }, + { "download_dir", XT_S_STR, 0, NULL, NULL,&s_download_dir, NULL, NULL }, { "download_mode", XT_S_STR, 0, NULL, NULL,&s_download_mode, NULL, set_download_mode_rt }, - { "edit_mode", XT_S_STR, 0, NULL, NULL,&s_edit_mode }, - { "enable_cookie_whitelist", XT_S_INT, 0, &enable_cookie_whitelist, NULL, NULL }, - { "enable_js_whitelist", XT_S_INT, 0, &enable_js_whitelist, NULL, NULL }, - { "enable_plugin_whitelist", XT_S_INT, 0, &enable_plugin_whitelist, NULL, NULL }, - { "enable_localstorage", XT_S_INT, 0, &enable_localstorage, NULL, NULL }, - { "enable_plugins", XT_S_INT, 0, &enable_plugins, NULL, NULL }, - { "enable_scripts", XT_S_INT, 0, &enable_scripts, NULL, NULL }, - { "enable_socket", XT_S_INT, XT_SF_RESTART,&enable_socket, NULL, NULL }, - { "enable_spell_checking", XT_S_INT, 0, &enable_spell_checking, NULL, NULL }, - { "encoding", XT_S_STR, 0, NULL, &encoding, NULL }, + { "edit_mode", XT_S_STR, 0, NULL, NULL,&s_edit_mode, NULL, NULL}, + { "enable_cookie_whitelist", XT_S_INT, 0, &enable_cookie_whitelist, NULL, NULL, NULL, NULL }, + { "enable_js_whitelist", XT_S_INT, 0, &enable_js_whitelist, NULL, NULL, NULL, NULL }, + { "enable_plugin_whitelist", XT_S_INT, 0, &enable_plugin_whitelist, NULL, NULL, NULL, NULL }, + { "enable_localstorage", XT_S_INT, 0, &enable_localstorage, NULL, NULL, NULL, NULL}, + { "enable_plugins", XT_S_INT, 0, &enable_plugins, NULL, NULL, NULL, NULL }, + { "enable_scripts", XT_S_INT, 0, &enable_scripts, NULL, NULL, NULL, NULL }, + { "enable_socket", XT_S_INT, XT_SF_RESTART,&enable_socket, NULL, NULL, NULL, NULL }, + { "enable_spell_checking", XT_S_INT, 0, &enable_spell_checking, NULL, NULL, NULL, NULL }, + { "encoding", XT_S_STR, 0, NULL, &encoding, NULL, NULL, NULL }, { "external_editor", XT_S_STR,0, NULL, &external_editor, NULL, NULL, set_external_editor }, - { "fancy_bar", XT_S_INT, XT_SF_RESTART,&fancy_bar, NULL, NULL }, - { "guess_search", XT_S_INT, 0, &guess_search, NULL, NULL }, - { "history_autosave", XT_S_INT, 0, &history_autosave, NULL, NULL }, - { "home", XT_S_STR, 0, NULL, &home, NULL }, + { "fancy_bar", XT_S_INT, XT_SF_RESTART,&fancy_bar, NULL, NULL, NULL, NULL }, + { "guess_search", XT_S_INT, 0, &guess_search, NULL, NULL, NULL, NULL }, + { "history_autosave", XT_S_INT, 0, &history_autosave, NULL, NULL, NULL, NULL }, + { "home", XT_S_STR, 0, NULL, &home, NULL, NULL, NULL }, { "http_proxy", XT_S_STR, 0, NULL, &http_proxy, NULL, NULL, set_http_proxy }, - { "icon_size", XT_S_INT, 0, &icon_size, NULL, NULL }, - { "js_autorun_enabled", XT_S_INT, 0, &js_autorun_enabled, NULL, NULL }, - { "max_connections", XT_S_INT, XT_SF_RESTART,&max_connections, NULL, NULL }, - { "max_host_connections", XT_S_INT, XT_SF_RESTART,&max_host_connections, NULL, NULL }, - { "read_only_cookies", XT_S_INT, 0, &read_only_cookies, NULL, NULL }, - { "refresh_interval", XT_S_INT, 0, &refresh_interval, NULL, NULL }, - { "resource_dir", XT_S_STR, 0, NULL, &resource_dir, NULL }, - { "search_string", XT_S_STR, 0, NULL, &search_string, NULL }, - { "save_global_history", XT_S_INT, XT_SF_RESTART,&save_global_history, NULL, NULL }, - { "save_rejected_cookies", XT_S_INT, XT_SF_RESTART,&save_rejected_cookies, NULL, NULL }, - { "session_timeout", XT_S_INT, 0, &session_timeout, NULL, NULL }, - { "session_autosave", XT_S_INT, 0, &session_autosave, NULL, NULL }, - { "single_instance", XT_S_INT, XT_SF_RESTART,&single_instance, NULL, NULL }, - { "show_tabs", XT_S_INT, 0, &show_tabs, NULL, NULL }, - { "show_url", XT_S_INT, 0, &show_url, NULL, NULL }, - { "show_statusbar", XT_S_INT, 0, &show_statusbar, NULL, NULL }, - { "spell_check_languages", XT_S_STR, 0, NULL, &spell_check_languages, NULL }, - { "ssl_ca_file", XT_S_STR, 0, NULL, &ssl_ca_file, NULL }, - { "ssl_strict_certs", XT_S_INT, 0, &ssl_strict_certs, NULL, NULL }, - { "enable_strict_transport", XT_S_INT, 0, &enable_strict_transport, NULL, NULL }, - { "statusbar_elems", XT_S_STR, 0, NULL, &statusbar_elems, NULL }, - { "tab_style", XT_S_STR, 0, NULL, NULL,&s_tab_style }, - { "userstyle_global", XT_S_INT, 0, &userstyle_global, NULL, NULL }, - { "url_regex", XT_S_STR, 0, NULL, &url_regex, NULL }, - { "window_height", XT_S_INT, 0, &window_height, NULL, NULL }, - { "window_width", XT_S_INT, 0, &window_width, NULL, NULL }, - { "window_maximize", XT_S_INT, 0, &window_maximize, NULL, NULL }, - { "work_dir", XT_S_STR, 0, NULL, NULL,&s_work_dir }, - { "xterm_workaround", XT_S_INT, 0, &xterm_workaround, NULL, NULL }, + { "icon_size", XT_S_INT, 0, &icon_size, NULL, NULL, NULL, NULL }, + { "js_autorun_enabled", XT_S_INT, 0, &js_autorun_enabled, NULL, NULL, NULL, NULL }, + { "max_connections", XT_S_INT, XT_SF_RESTART,&max_connections, NULL, NULL, NULL, NULL }, + { "max_host_connections", XT_S_INT, XT_SF_RESTART,&max_host_connections, NULL, NULL, NULL, NULL }, + { "read_only_cookies", XT_S_INT, 0, &read_only_cookies, NULL, NULL, NULL, NULL }, + { "refresh_interval", XT_S_INT, 0, &refresh_interval, NULL, NULL, NULL, NULL }, + { "resource_dir", XT_S_STR, 0, NULL, &resource_dir, NULL, NULL, NULL }, + { "search_string", XT_S_STR, 0, NULL, &search_string, NULL, NULL, NULL }, + { "save_global_history", XT_S_INT, XT_SF_RESTART,&save_global_history, NULL, NULL, NULL, NULL }, + { "save_rejected_cookies", XT_S_INT, XT_SF_RESTART,&save_rejected_cookies, NULL, NULL, NULL, NULL }, + { "session_timeout", XT_S_INT, 0, &session_timeout, NULL, NULL, NULL, NULL }, + { "session_autosave", XT_S_INT, 0, &session_autosave, NULL, NULL, NULL, NULL }, + { "single_instance", XT_S_INT, XT_SF_RESTART,&single_instance, NULL, NULL, NULL, NULL }, + { "show_tabs", XT_S_INT, 0, &show_tabs, NULL, NULL, NULL, NULL }, + { "show_url", XT_S_INT, 0, &show_url, NULL, NULL, NULL, NULL }, + { "show_statusbar", XT_S_INT, 0, &show_statusbar, NULL, NULL, NULL, NULL }, + { "spell_check_languages", XT_S_STR, 0, NULL, &spell_check_languages, NULL, NULL, NULL }, + { "ssl_ca_file", XT_S_STR, 0, NULL, &ssl_ca_file, NULL, NULL, NULL }, + { "ssl_strict_certs", XT_S_INT, 0, &ssl_strict_certs, NULL, NULL, NULL, NULL }, + { "enable_strict_transport", XT_S_INT, 0, &enable_strict_transport, NULL, NULL, NULL, NULL }, + { "statusbar_elems", XT_S_STR, 0, NULL, &statusbar_elems, NULL, NULL, NULL }, + { "tab_style", XT_S_STR, 0, NULL, NULL,&s_tab_style, NULL, NULL }, + { "userstyle_global", XT_S_INT, 0, &userstyle_global, NULL, NULL, NULL, NULL }, + { "url_regex", XT_S_STR, 0, NULL, &url_regex, NULL, NULL, NULL }, + { "window_height", XT_S_INT, 0, &window_height, NULL, NULL, NULL, NULL }, + { "window_width", XT_S_INT, 0, &window_width, NULL, NULL, NULL, NULL }, + { "window_maximize", XT_S_INT, 0, &window_maximize, NULL, NULL, NULL, NULL }, + { "work_dir", XT_S_STR, 0, NULL, NULL,&s_work_dir, NULL, NULL }, + { "xterm_workaround", XT_S_INT, 0, &xterm_workaround, NULL, NULL, NULL, NULL }, { "auto_load_images", XT_S_INT, 0, &auto_load_images, NULL, NULL, NULL, set_auto_load_images }, { "enable_autoscroll", XT_S_INT, 0, &enable_autoscroll, NULL, NULL, NULL, set_enable_autoscroll }, { "enable_favicon_entry", XT_S_INT, 0, &enable_favicon_entry, NULL, NULL, NULL, set_enable_favicon_entry }, @@ -364,13 +364,13 @@ struct settings rs[] = { { "tabbar_font", XT_S_STR, 0, NULL, &tabbar_font_name, NULL }, /* runtime settings */ - { "alias", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_alias }, - { "cookie_wl", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_cookie_wl }, - { "js_wl", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_js }, - { "keybinding", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_kb }, - { "mime_type", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_mime }, - { "pl_wl", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_pl }, - { "user_agent", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_ua }, + { "alias", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_alias, NULL, NULL }, + { "cookie_wl", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_cookie_wl, NULL, NULL }, + { "js_wl", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_js, NULL, NULL }, + { "keybinding", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_kb, NULL, NULL }, + { "mime_type", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_mime, NULL, NULL }, + { "pl_wl", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_pl, NULL, NULL }, + { "user_agent", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_ua, NULL, NULL }, }; size_t -- 2.11.4.GIT