From e1ec4835d05d9a0cf6e8dd2cca00925c73484a1f Mon Sep 17 00:00:00 2001 From: TaeminYeom Date: Wed, 15 Feb 2023 17:22:26 +0900 Subject: [PATCH] display: Change get_var_display_config return type to const To prevent modify display config static struct in other file. If it wanted to be modified later, setter will have to be added. Change-Id: I477fc8476981f18d92509dfb6b2c0783cc7df734 Signed-off-by: TaeminYeom --- plugins/iot-headed/display/core.c | 2 +- plugins/iot-headed/display/device-interface.c | 2 +- plugins/iot-headed/display/key-filter.c | 2 +- plugins/mobile/display/core.c | 2 +- plugins/mobile/display/device-interface.c | 2 +- plugins/mobile/display/key-filter.c | 2 +- plugins/tv/display/core.c | 2 +- plugins/tv/display/device-interface.c | 2 +- plugins/tv/display/key-filter.c | 2 +- plugins/wearable/display/auto-brightness-sensorhub.c | 2 +- plugins/wearable/display/core.c | 2 +- plugins/wearable/display/device-interface.c | 2 +- plugins/wearable/display/key-filter.c | 2 +- src/display/auto-brightness.c | 2 +- src/display/core.h | 2 +- src/display/display-dbus.c | 2 +- src/display/display-input.c | 2 +- src/display/display-lock.c | 2 +- src/display/setting.c | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/plugins/iot-headed/display/core.c b/plugins/iot-headed/display/core.c index 0a87e47..47e7e01 100644 --- a/plugins/iot-headed/display/core.c +++ b/plugins/iot-headed/display/core.c @@ -210,7 +210,7 @@ struct display_function_info display_info = { .face_detection = NULL, }; -inline struct display_config* get_var_display_config() +inline const struct display_config* get_var_display_config() { return &display_conf; } diff --git a/plugins/iot-headed/display/device-interface.c b/plugins/iot-headed/display/device-interface.c index ecb5eb2..188f583 100644 --- a/plugins/iot-headed/display/device-interface.c +++ b/plugins/iot-headed/display/device-interface.c @@ -76,7 +76,7 @@ static int default_brightness; static int dpms_running_state = DPMS_SETTING_DONE; static bool display_dev_available = false; static guint release_timer; -static struct display_config *display_conf; +static const struct display_config *display_conf; inline struct _backlight_ops *get_var_backlight_ops(void) { diff --git a/plugins/iot-headed/display/key-filter.c b/plugins/iot-headed/display/key-filter.c index db9a338..7b75ac7 100644 --- a/plugins/iot-headed/display/key-filter.c +++ b/plugins/iot-headed/display/key-filter.c @@ -430,7 +430,7 @@ static int process_power_key(struct input_event *pinput) int ignore = true; static int value = KEY_RELEASED; unsigned int caps; - struct display_config *display_conf = get_var_display_config(); + const struct display_config *display_conf = get_var_display_config(); if (!display_conf) { _E("Failed to get display configuration variable."); return ignore; diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index 7948278..4927f70 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -212,7 +212,7 @@ struct display_function_info display_info = { .face_detection = NULL, }; -inline struct display_config* get_var_display_config() +inline const struct display_config* get_var_display_config() { return &display_conf; } diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c index cef8002..d7d79db 100644 --- a/plugins/mobile/display/device-interface.c +++ b/plugins/mobile/display/device-interface.c @@ -75,7 +75,7 @@ static int default_brightness; static int dpms_running_state = DPMS_SETTING_DONE; static bool display_dev_available = false; static guint release_timer; -static struct display_config *display_conf; +static const struct display_config *display_conf; inline struct _backlight_ops *get_var_backlight_ops(void) { diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c index 1e56db1..b8fb9ca 100644 --- a/plugins/mobile/display/key-filter.c +++ b/plugins/mobile/display/key-filter.c @@ -449,7 +449,7 @@ static int process_power_key(struct input_event *pinput) int ignore = true; static int value = KEY_RELEASED; unsigned int caps; - struct display_config *display_conf = get_var_display_config(); + const struct display_config *display_conf = get_var_display_config(); if (!display_conf) { _E("Failed to get display configuration variable."); return ignore; diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c index f9655cd..a596b62 100644 --- a/plugins/tv/display/core.c +++ b/plugins/tv/display/core.c @@ -210,7 +210,7 @@ struct display_function_info display_info = { .face_detection = NULL, }; -inline struct display_config* get_var_display_config() +inline const struct display_config* get_var_display_config() { return &display_conf; } diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c index 8c1cd1c..128b637 100644 --- a/plugins/tv/display/device-interface.c +++ b/plugins/tv/display/device-interface.c @@ -76,7 +76,7 @@ static int default_brightness; static int dpms_running_state = DPMS_SETTING_DONE; static bool display_dev_available = false; static guint release_timer; -static struct display_config *display_conf; +static const struct display_config *display_conf; inline struct _backlight_ops *get_var_backlight_ops(void) { diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c index 42851ce..e3b3cdf 100644 --- a/plugins/tv/display/key-filter.c +++ b/plugins/tv/display/key-filter.c @@ -430,7 +430,7 @@ static int process_power_key(struct input_event *pinput) int ignore = true; static int value = KEY_RELEASED; unsigned int caps; - struct display_config *display_conf = get_var_display_config(); + const struct display_config *display_conf = get_var_display_config(); if(!display_conf) { _E("Failed to get display configuration variable."); return ignore; diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c index 9eda1a1..51950bf 100644 --- a/plugins/wearable/display/auto-brightness-sensorhub.c +++ b/plugins/wearable/display/auto-brightness-sensorhub.c @@ -43,7 +43,7 @@ static bool lbm, hbm, hold_brt, lowdim; static void change_brightness_transit(int start, int end) { - struct display_config *display_conf = get_var_display_config(); + const struct display_config *display_conf = get_var_display_config(); if(!display_conf) { _E("Failed to get display configuration variable."); return ; diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index 293206d..de4d504 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -235,7 +235,7 @@ struct display_function_info display_info = { .face_detection = NULL, }; -inline struct display_config *get_var_display_config() +inline const struct display_config *get_var_display_config() { return &display_conf; } diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c index 9689dd0..4683490 100644 --- a/plugins/wearable/display/device-interface.c +++ b/plugins/wearable/display/device-interface.c @@ -86,7 +86,7 @@ static int aod_max_level = -1; static int aod_normal_level = -1; static int aod_min_level = -1; static int aod_charging_level = -1; -static struct display_config *display_conf; +static const struct display_config *display_conf; static struct battery_status *battery = NULL; static struct battery_status* (*fp_get_var_battery_status)(void); diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c index ab4b47c..65ba5ab 100644 --- a/plugins/wearable/display/key-filter.c +++ b/plugins/wearable/display/key-filter.c @@ -426,7 +426,7 @@ static int process_power_key(struct input_event *pinput) int ignore = true; static int value = KEY_RELEASED; unsigned int caps; - struct display_config *display_conf = get_var_display_config(); + const struct display_config *display_conf = get_var_display_config(); if (!display_conf) { _E("Failed to get display configuration variable."); return ignore; diff --git a/src/display/auto-brightness.c b/src/display/auto-brightness.c index 9b00ecf..d7a740d 100644 --- a/src/display/auto-brightness.c +++ b/src/display/auto-brightness.c @@ -73,7 +73,7 @@ static char *min_brightness_name = 0; /* light sensor */ static float lmax, lmin; -static struct display_config *display_conf; +static const struct display_config *display_conf; static bool update_working_position(void) { diff --git a/src/display/core.h b/src/display/core.h index fb52ede..34b6c94 100644 --- a/src/display/core.h +++ b/src/display/core.h @@ -127,7 +127,7 @@ struct display_config { * Global variables * display_conf : configuration of display */ -struct display_config* get_var_display_config(); +const struct display_config* get_var_display_config(); /* * @brief Display Extension features diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c index 5c92a43..19c30f2 100644 --- a/src/display/display-dbus.c +++ b/src/display/display-dbus.c @@ -73,7 +73,7 @@ static struct display_plugin *disp_plgn; static struct _backlight_ops *backlight_ops; -static struct display_config *display_conf; +static const struct display_config *display_conf; static GVariant *dbus_start(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, diff --git a/src/display/display-input.c b/src/display/display-input.c index 05fcde6..df63a54 100644 --- a/src/display/display-input.c +++ b/src/display/display-input.c @@ -38,7 +38,7 @@ static void process_input(struct libinput_event *ev) struct libinput_event_keyboard *k; unsigned int time; int fd = 0; - struct display_config *display_conf = get_var_display_config(); + const struct display_config *display_conf = get_var_display_config(); if(!display_conf) { _E("Failed to get display configuration variable."); return; diff --git a/src/display/display-lock.c b/src/display/display-lock.c index 265fd09..bfdd7e9 100644 --- a/src/display/display-lock.c +++ b/src/display/display-lock.c @@ -42,7 +42,7 @@ static struct _backlight_ops *backlight_ops; static GList *cond_head[S_END]; static int trans_condition; -static struct display_config *display_conf; +static const struct display_config *display_conf; bool check_lock_state(int state) { diff --git a/src/display/setting.c b/src/display/setting.c index 0b0ebb2..cc695ff 100644 --- a/src/display/setting.c +++ b/src/display/setting.c @@ -48,7 +48,7 @@ static int force_lcdtimeout = 0; static int custom_on_timeout = 0; static int custom_normal_timeout = 0; static int custom_dim_timeout = 0; -static struct display_config *display_conf; +static const struct display_config *display_conf; int (*update_pm_setting) (int key_idx, int val); -- 2.7.4