enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Fix up some nasty formatting :) 

SVN revision: 37591
This commit is contained in:
Christopher Michael 2008-11-12 00:28:13 +00:00
parent 22efb68ab5
commit 513ce4e1fd
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/modules/temperature/tempget.c
View File

@ -30,9 +30,9 @@ temperature_get_bus_files(const char* bus)
{ {
Ecore_List *result; Ecore_List *result;
Ecore_List *therms; Ecore_List *therms;
char path[PATH_MAX]; char path[PATH_MAX];
char busdir[PATH_MAX]; char busdir[PATH_MAX];
result = ecore_list_new(); result = ecore_list_new();
if (result) if (result)
{ {
@ -43,27 +43,26 @@ temperature_get_bus_files(const char* bus)
if (therms) if (therms)
{ {
char *name; char *name;
while ((name = ecore_list_next(therms))) while ((name = ecore_list_next(therms)))
{ {
Ecore_List *files; Ecore_List *files;
/* Search each device for temp*_input, these should be /* Search each device for temp*_input, these should be
* temperature devices. */ * temperature devices. */
snprintf(path, sizeof(path), snprintf(path, sizeof(path),"%s/%s", busdir, name);
"%s/%s", busdir, name);
files = ecore_file_ls(path); files = ecore_file_ls(path);
if (files) if (files)
{ {
char *file; char *file;
while ((file = ecore_list_next(files))) while ((file = ecore_list_next(files)))
{ {
if ((!strncmp("temp", file, 4)) && if ((!strncmp("temp", file, 4)) &&
(!strcmp("_input", &file[strlen(file) - 6]))) (!strcmp("_input", &file[strlen(file) - 6])))
{ {
char *f; char *f;
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
"%s/%s/%s", busdir, name, file); "%s/%s/%s", busdir, name, file);
f = strdup(path); f = strdup(path);
@ -84,11 +83,11 @@ static void
init(void) init(void)
{ {
Ecore_List *therms; Ecore_List *therms;
char path[PATH_MAX]; char path[PATH_MAX];
#ifdef __FreeBSD__ #ifdef __FreeBSD__
int len; int len;
#endif #endif
if ((!sensor_type) || ((!sensor_name) || (sensor_name[0] == 0))) if ((!sensor_type) || ((!sensor_name) || (sensor_name[0] == 0)))
{ {
if (sensor_name) free(sensor_name); if (sensor_name) free(sensor_name);
@ -103,7 +102,7 @@ init(void)
if ((therms) && (!ecore_list_empty_is(therms))) if ((therms) && (!ecore_list_empty_is(therms)))
{ {
char *name; char *name;
name = ecore_list_next(therms); name = ecore_list_next(therms);
sensor_type = SENSOR_TYPE_LINUX_ACPI; sensor_type = SENSOR_TYPE_LINUX_ACPI;
sensor_name = strdup(name); sensor_name = strdup(name);
@ -139,13 +138,13 @@ init(void)
if (therms) if (therms)
{ {
char *name; char *name;
if ((name = ecore_list_next(therms))) if ((name = ecore_list_next(therms)))
{ {
if (ecore_file_exists(name)) if (ecore_file_exists(name))
{ {
int len; int len;
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
"%s", ecore_file_file_get(name)); "%s", ecore_file_file_get(name));
len = strlen(path); len = strlen(path);
@ -154,9 +153,9 @@ init(void)
sensor_path = strdup(name); sensor_path = strdup(name);
sensor_name = strdup(path); sensor_name = strdup(path);
printf("sensor type = i2c\n" printf("sensor type = i2c\n"
"sensor path = %s\n" "sensor path = %s\n"
"sensor name = %s\n", "sensor name = %s\n",
sensor_path, sensor_name); sensor_path, sensor_name);
} }
} }
ecore_list_destroy(therms); ecore_list_destroy(therms);
@ -176,16 +175,16 @@ init(void)
int len; int len;
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
"%s", ecore_file_file_get(name)); "%s", ecore_file_file_get(name));
len = strlen(path); len = strlen(path);
if (len > 6) path[len - 6] = '\0'; if (len > 6) path[len - 6] = '\0';
sensor_type = SENSOR_TYPE_LINUX_PCI; sensor_type = SENSOR_TYPE_LINUX_PCI;
sensor_path = strdup(name); sensor_path = strdup(name);
sensor_name = strdup(path); sensor_name = strdup(path);
printf("sensor type = pci\n" printf("sensor type = pci\n"
"sensor path = %s\n" "sensor path = %s\n"
"sensor name = %s\n", "sensor name = %s\n",
sensor_path, sensor_name); sensor_path, sensor_name);
} }
} }
ecore_list_destroy(therms); ecore_list_destroy(therms);
@ -227,7 +226,7 @@ init(void)
if (therms) if (therms)
{ {
char *name; char *name;
while ((name = ecore_list_next(therms))) while ((name = ecore_list_next(therms)))
{ {
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
@ -249,7 +248,7 @@ init(void)
if (therms) if (therms)
{ {
char *name; char *name;
while ((name = ecore_list_next(therms))) while ((name = ecore_list_next(therms)))
{ {
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
@ -268,8 +267,7 @@ init(void)
break; break;
case SENSOR_TYPE_LINUX_ACPI: case SENSOR_TYPE_LINUX_ACPI:
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
"/proc/acpi/thermal_zone/%s/temperature", "/proc/acpi/thermal_zone/%s/temperature", sensor_name);
sensor_name);
sensor_path = strdup(path); sensor_path = strdup(path);
break; break;
} }
@ -313,8 +311,9 @@ check(void)
if (f) if (f)
{ {
char dummy[4096]; char dummy[4096];
fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; fgets(buf, sizeof(buf), f);
buf[sizeof(buf) - 1] = 0;
if (sscanf(buf, "%s %s %i", dummy, dummy, &temp) == 3) if (sscanf(buf, "%s %s %i", dummy, dummy, &temp) == 3)
ret = 1; ret = 1;
else else
@ -329,7 +328,8 @@ check(void)
f = fopen(sensor_path, "rb"); f = fopen(sensor_path, "rb");
if (f) if (f)
{ {
fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; fgets(buf, sizeof(buf), f);
buf[sizeof(buf) - 1] = 0;
if (sscanf(buf, "%i", &temp) == 1) if (sscanf(buf, "%i", &temp) == 1)
ret = 1; ret = 1;
else else
@ -346,7 +346,7 @@ check(void)
{ {
fgets(buf, sizeof(buf), f); fgets(buf, sizeof(buf), f);
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
/* actually read the temp */ /* actually read the temp */
if (sscanf(buf, "%i", &temp) == 1) if (sscanf(buf, "%i", &temp) == 1)
ret = 1; ret = 1;
@ -365,7 +365,7 @@ check(void)
{ {
fgets(buf, sizeof(buf), f); fgets(buf, sizeof(buf), f);
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
/* actually read the temp */ /* actually read the temp */
if (sscanf(buf, "%i", &temp) == 1) if (sscanf(buf, "%i", &temp) == 1)
ret = 1; ret = 1;
@ -383,7 +383,9 @@ check(void)
if (f) if (f)
{ {
char *p, *q; char *p, *q;
fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
fgets(buf, sizeof(buf), f);
buf[sizeof(buf) - 1] = 0;
fclose(f); fclose(f);
p = strchr(buf, ':'); p = strchr(buf, ':');
if (p) if (p)
@ -402,9 +404,9 @@ check(void)
goto error; goto error;
break; break;
} }
if (ret) return temp; if (ret) return temp;
return -999; return -999;
error: error:
sensor_type = SENSOR_TYPE_NONE; sensor_type = SENSOR_TYPE_NONE;
@ -420,7 +422,7 @@ poll_cb(void *data)
{ {
int t; int t;
int pp; int pp;
t = check(); t = check();
pp = cur_poll_interval; pp = cur_poll_interval;
if (t != ptemp) if (t != ptemp)
@ -469,18 +471,18 @@ main(int argc, char *argv[])
} }
poll_interval = atoi(argv[3]); poll_interval = atoi(argv[3]);
cur_poll_interval = poll_interval; cur_poll_interval = poll_interval;
ecore_init(); ecore_init();
init(); init();
if (poller) ecore_poller_del(poller); if (poller) ecore_poller_del(poller);
poller = ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval, poller = ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval,
poll_cb, NULL); poll_cb, NULL);
poll_cb(NULL); poll_cb(NULL);
ecore_main_loop_begin(); ecore_main_loop_begin();
ecore_shutdown(); ecore_shutdown();
return 0; return 0;
} }