Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c
Log Message:
formatting
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- e_mod_main.c 2 Aug 2005 09:52:30 -0000 1.36
+++ e_mod_main.c 2 Aug 2005 09:55:03 -0000 1.37
@@ -5,13 +5,13 @@
#include "e_mod_main.h"
#ifdef __FreeBSD__
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <fcntl.h>
- #ifdef __i386__
- #include <machine/apm_bios.h>
- #endif
-#include <stdio.h>
+# include <sys/types.h>
+# include <sys/sysctl.h>
+# include <fcntl.h>
+# ifdef __i386__
+# include <machine/apm_bios.h>
+# endif
+# include <stdio.h>
#endif
/* TODO List:
@@ -27,8 +27,10 @@
static Status *_battery_linux_acpi_check(Battery *ef);
static Status *_battery_linux_apm_check(Battery *ef);
/* Should these be #ifdef'd ? */
+#ifdef __FreeBSD__
static Status *_battery_bsd_acpi_check(Battery *ef);
static Status *_battery_bsd_apm_check(Battery *ef);
+#endif
static Battery_Face *_battery_face_new(E_Container *con);
static void _battery_face_free(Battery_Face *ef);
@@ -659,14 +661,16 @@
len = sizeof(acline);
if (sysctlbyname("hw.acpi.acline", &acline, &len, NULL, 0) == 0)
{
- len = 3;
- if (sysctlnametomib("hw.acpi.acline", acline_mib, &len) == 0)
+ len = 3;
+ if (sysctlnametomib("hw.acpi.acline", acline_mib, &len) == 0)
ef->battery_check_mode = CHECK_ACPI;
- } else {
- apm_fd = open("/dev/apm", O_RDONLY);
+ }
+ else
+ {
+ apm_fd = open("/dev/apm", O_RDONLY);
if (apm_fd != -1)
- ef->battery_check_mode = CHECK_APM;
- }
+ ef->battery_check_mode = CHECK_APM;
+ }
}
switch (ef->battery_check_mode)
{
@@ -1366,4 +1370,3 @@
face = data;
e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT);
}
-
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
