Fix indents 04

author: info-cppsp <[email protected]> 2017-11-18 16:21:24 +0100
committer: raveit65 <[email protected]> 2017-11-26 20:41:43 +0100
commit: b678af6c09b45c7dd2488972ec78a8d86b34a206 (patch)
tree: 908e97cce6b87db5789348bd9f9a6786b7e62a26 /plugins/smu-sys
parent: 03d94bc09168713cdc3f9d0a51539d4b8398ba0d (diff)
download: mate-sensors-applet-b678af6c09b45c7dd2488972ec78a8d86b34a206.tar.bz2
mate-sensors-applet-b678af6c09b45c7dd2488972ec78a8d86b34a206.tar.xz
1 files changed, 113 insertions, 111 deletions
diff --git a/plugins/smu-sys/smu-sys-plugin.c b/plugins/smu-sys/smu-sys-plugin.c
index f306be4..75f2b6a 100644
--- a/plugins/smu-sys/smu-sys-plugin.c
+++ b/plugins/smu-sys/smu-sys-plugin.c
@@ -41,140 +41,142 @@ const gchar *plugin_name = "smu-sys";
 
 
 enum {
- SMU_SYS_DEVICE_FILE_OPEN_ERROR,
- SMU_SYS_DEVICE_FILE_READ_ERROR
+ SMU_SYS_DEVICE_FILE_OPEN_ERROR,
+ SMU_SYS_DEVICE_FILE_READ_ERROR
 };
 
 static void smu_sys_plugin_add_sensor(GList **sensors, const gchar *path) {
- gchar *filename;
- gchar *label = NULL;
- gboolean enable;
- SensorType sensor_type;
- IconType icon_type = GENERIC_ICON;
-
- filename = g_path_get_basename(path);
-
- if (g_ascii_strcasecmp(filename, SENSOR1 TEMPERATURE) == 0 || g_ascii_strcasecmp(filename, CPU TEMPERATURE) == 0) {
- label = g_strdup(_("CPU"));
- sensor_type = TEMP_SENSOR;
- enable = TRUE;
- icon_type = CPU_ICON;
- } else if (g_ascii_strcasecmp(filename, SENSOR2 TEMPERATURE) == 0 || g_ascii_strcasecmp(filename, GPU TEMPERATURE) == 0) {
- label = g_strdup(_("GPU"));
- sensor_type = TEMP_SENSOR;
- enable = TRUE;
- icon_type = GPU_ICON;
- } else if (g_ascii_strcasecmp(filename, SENSOR1 FAN_SPEED) == 0|| g_ascii_strcasecmp(filename, CPU FAN_SPEED) == 0) { 
- label = g_strdup(_("FAN"));
- sensor_type = FAN_SENSOR;
- enable = TRUE;
- icon_type = FAN_ICON;
- } else {
- /* disable all other sensors */
- enable = FALSE;
- }
-
- /* only add these 3 sensors */
- if (enable) {
- sensors_applet_plugin_add_sensor(sensors,
- path,
- filename,
- label,
- sensor_type,
- enable,
- icon_type,
- DEFAULT_GRAPH_COLOR);
- 
- }
- g_free(filename);
- if (label != NULL) {
- g_free(label);
- }
-} 
+ gchar *filename;
+ gchar *label = NULL;
+ gboolean enable;
+ SensorType sensor_type;
+ IconType icon_type = GENERIC_ICON;
+
+ filename = g_path_get_basename(path);
+
+ if (g_ascii_strcasecmp(filename, SENSOR1 TEMPERATURE) == 0 || g_ascii_strcasecmp(filename, CPU TEMPERATURE) == 0) {
+ label = g_strdup(_("CPU"));
+ sensor_type = TEMP_SENSOR;
+ enable = TRUE;
+ icon_type = CPU_ICON;
+ } else if (g_ascii_strcasecmp(filename, SENSOR2 TEMPERATURE) == 0 || g_ascii_strcasecmp(filename, GPU TEMPERATURE) == 0) {
+ label = g_strdup(_("GPU"));
+ sensor_type = TEMP_SENSOR;
+ enable = TRUE;
+ icon_type = GPU_ICON;
+ } else if (g_ascii_strcasecmp(filename, SENSOR1 FAN_SPEED) == 0|| g_ascii_strcasecmp(filename, CPU FAN_SPEED) == 0) {
+ label = g_strdup(_("FAN"));
+ sensor_type = FAN_SENSOR;
+ enable = TRUE;
+ icon_type = FAN_ICON;
+ } else {
+ /* disable all other sensors */
+ enable = FALSE;
+ }
+
+ /* only add these 3 sensors */
+ if (enable) {
+ sensors_applet_plugin_add_sensor(sensors,
+ path,
+ filename,
+ label,
+ sensor_type,
+ enable,
+ icon_type,
+ DEFAULT_GRAPH_COLOR);
+
+ }
+
+ g_free(filename);
+ if (label != NULL) {
+ g_free(label);
+ }
+}
 
 static void smu_sys_plugin_test_sensor(GList **sensors, const gchar *path) {
- gchar *filename;
-
- filename = g_path_get_basename(path);
- if (g_ascii_strcasecmp(filename, SENSOR1 TEMPERATURE) == 0 ||
- g_ascii_strcasecmp(filename, SENSOR2 TEMPERATURE) == 0 ||
- g_ascii_strcasecmp(filename, SENSOR1 FAN_SPEED) == 0 ||
- g_ascii_strcasecmp(filename, CPU TEMPERATURE) == 0 ||
- g_ascii_strcasecmp(filename, GPU TEMPERATURE) == 0 ||
- g_ascii_strcasecmp(filename, CPU FAN_SPEED) == 0) {
- smu_sys_plugin_add_sensor(sensors, path);
- }
- g_free(filename);
+ gchar *filename;
+
+ filename = g_path_get_basename(path);
+ if (g_ascii_strcasecmp(filename, SENSOR1 TEMPERATURE) == 0 ||
+ g_ascii_strcasecmp(filename, SENSOR2 TEMPERATURE) == 0 ||
+ g_ascii_strcasecmp(filename, SENSOR1 FAN_SPEED) == 0 ||
+ g_ascii_strcasecmp(filename, CPU TEMPERATURE) == 0 ||
+ g_ascii_strcasecmp(filename, GPU TEMPERATURE) == 0 ||
+ g_ascii_strcasecmp(filename, CPU FAN_SPEED) == 0) {
+
+ smu_sys_plugin_add_sensor(sensors, path);
+ }
+ g_free(filename);
 }
 
+
 /* to be called to setup for sys sensors */
 GList *smu_sys_plugin_init(void) {
- GList *sensors = NULL;
- 
- /* call function to recursively look for sensors
- starting at the defined base directory */
- sensors_applet_plugin_find_sensors(&sensors, 
- SMU_SYS_BASE_DIR, 
- smu_sys_plugin_test_sensor);
-
- return sensors;
+ GList *sensors = NULL;
+
+ /* call function to recursively look for sensors
+ starting at the defined base directory */
+ sensors_applet_plugin_find_sensors(&sensors, SMU_SYS_BASE_DIR, smu_sys_plugin_test_sensor);
+
+ return sensors;
 }
 
 /* returns the value of the sensor_list at the given iter, or if an
 error occurs, instatiates error with an error message */
-gdouble smu_sys_plugin_get_sensor_value(const gchar *path, 
- const gchar *id, 
- SensorType type,
- GError **error) {
-
- /* to open and access the value of each sensor */
- FILE *fp;
- gfloat sensor_value = -1.0;
-
- if (NULL == (fp = fopen(path, "r"))) {
- g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, SMU_SYS_DEVICE_FILE_OPEN_ERROR, "Error opening sensor device file %s", path);
- return -1.0;
- }
- switch(type) {
- case FAN_SENSOR:
- if (fscanf(fp, "%f", &sensor_value) != 1) {
- g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, SMU_SYS_DEVICE_FILE_READ_ERROR, "Error reading from sensor device file %s", path);
- fclose(fp);
- return -1.0;
- }
- break;
-
- case TEMP_SENSOR:
- if (fscanf(fp, "%f", &sensor_value) != 1) {
- g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, SMU_SYS_DEVICE_FILE_READ_ERROR, "Error reading from sensor device file %s", path);
- fclose(fp);
- return -1.0;
- }
- break;
-
- default:
- /* should only have added temp or fan sensors */
- g_error("Unknown sensor type passed as parameter to smu-sys sensor interface, cannot get value for this sensor");
+gdouble smu_sys_plugin_get_sensor_value(const gchar *path,
+ const gchar *id,
+ SensorType type,
+ GError **error) {
+
+ /* to open and access the value of each sensor */
+ FILE *fp;
+ gfloat sensor_value = -1.0;
+
+ if (NULL == (fp = fopen(path, "r"))) {
+ g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, SMU_SYS_DEVICE_FILE_OPEN_ERROR, "Error opening sensor device file %s", path);
+ return -1.0;
+ }
+ switch(type) {
+ case FAN_SENSOR:
+ if (fscanf(fp, "%f", &sensor_value) != 1) {
 g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, SMU_SYS_DEVICE_FILE_READ_ERROR, "Error reading from sensor device file %s", path);
- }
- fclose(fp);
+ fclose(fp);
+ return -1.0;
+ }
+ break;
 
- return (gdouble)sensor_value;
+ case TEMP_SENSOR:
+ if (fscanf(fp, "%f", &sensor_value) != 1) {
+ g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, SMU_SYS_DEVICE_FILE_READ_ERROR, "Error reading from sensor device file %s", path);
+ fclose(fp);
+ return -1.0;
+ }
+ break;
+
+ default:
+ /* should only have added temp or fan sensors */
+ g_error("Unknown sensor type passed as parameter to smu-sys sensor interface, cannot get value for this sensor");
+ g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, SMU_SYS_DEVICE_FILE_READ_ERROR, "Error reading from sensor device file %s", path);
+ }
+ fclose(fp);
+
+ return (gdouble)sensor_value;
 }
 
-const gchar *sensors_applet_plugin_name(void) 
+const gchar *sensors_applet_plugin_name(void)
 {
- return plugin_name;
+ return plugin_name;
 }
 
-GList *sensors_applet_plugin_init(void) 
+GList *sensors_applet_plugin_init(void)
 {
- return smu_sys_plugin_init();
+ return smu_sys_plugin_init();
 }
 
-gdouble sensors_applet_plugin_get_sensor_value(const gchar *path, 
- const gchar *id, 
+gdouble sensors_applet_plugin_get_sensor_value(const gchar *path,
+ const gchar *id,
 SensorType type,
 GError **error) {
- return smu_sys_plugin_get_sensor_value(path, id, type, error);
+
+ return smu_sys_plugin_get_sensor_value(path, id, type, error);
 }
author	info-cppsp <[email protected]>	2017-11-18 16:21:24 +0100
committer	raveit65 <[email protected]>	2017-11-26 20:41:43 +0100
commit	b678af6c09b45c7dd2488972ec78a8d86b34a206 (patch)
tree	908e97cce6b87db5789348bd9f9a6786b7e62a26 /plugins/smu-sys
parent	03d94bc09168713cdc3f9d0a51539d4b8398ba0d (diff)
download	mate-sensors-applet-b678af6c09b45c7dd2488972ec78a8d86b34a206.tar.bz2 mate-sensors-applet-b678af6c09b45c7dd2488972ec78a8d86b34a206.tar.xz