[Olsr-cvs] olsrd-current/src/linux apm.c,1.14,1.15

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/src/linux
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6216/src/linux

Modified Files:
	apm.c 
Log Message:
* fixed complaints from gcc -Wextra

Index: apm.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/linux/apm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** apm.c	7 Apr 2005 18:22:43 -0000	1.14
--- apm.c	26 Oct 2006 22:02:56 -0000	1.15
***************
*** 74,78 ****
  #define ACPI_PROC "/proc/acpi/info"
  
! const static char * acpi_info[] = 
    {
      "/proc/acpi/battery/0/info",
--- 74,78 ----
  #define ACPI_PROC "/proc/acpi/info"
  
! static const char * acpi_info[] = 
    {
      "/proc/acpi/battery/0/info",
***************
*** 83,87 ****
    };
  
! const static char * acpi_state[] =
    {    
      "/proc/acpi/battery/0/status",
--- 83,87 ----
    };
  
! static const char * acpi_state[] =
    {    
      "/proc/acpi/battery/0/status",
***************
*** 96,100 ****
  
  
! const static char * acpi_ac[] = 
    {    
      "/proc/acpi/ac_adapter/0/status",
--- 96,100 ----
  
  
! static const char * acpi_ac[] = 
    {    
      "/proc/acpi/ac_adapter/0/status",
***************
*** 124,128 ****
  
  int 
! apm_init()
  {
    struct olsr_apm_info ainfo;
--- 124,128 ----
  
  int 
! apm_init(void)
  {
    struct olsr_apm_info ainfo;
***************
*** 196,200 ****
      {
        /* Try re-opening the file */
!       if((apm_procfile = fopen(APM_PROC, "r")) < 0)
  	return 0;
        fgets(buffer, sizeof(buffer) - 1, apm_procfile);
--- 196,200 ----
      {
        /* Try re-opening the file */
!       if((apm_procfile = fopen(APM_PROC, "r")) != NULL)
  	return 0;
        fgets(buffer, sizeof(buffer) - 1, apm_procfile);
***************
*** 323,327 ****
  
  static int
! acpi_probe()
  {
    char s1[32], s2[32];
--- 323,327 ----
  
  static int
! acpi_probe(void)
  {
    char s1[32], s2[32];