[Olsr-cvs] olsrd-current/lib/httpinfo/src admin_interface.h, 1.3, 1.4 olsrd_httpinfo.c, 1.86, 1.87

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/lib/httpinfo/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27640/lib/httpinfo/src

Modified Files:
	admin_interface.h olsrd_httpinfo.c 
Log Message:
* added -Wwrite-strings

Index: olsrd_httpinfo.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** olsrd_httpinfo.c	15 Nov 2007 00:35:32 -0000	1.86
--- olsrd_httpinfo.c	16 Nov 2007 19:12:55 -0000	1.87
***************
*** 136,144 ****
    "border: 1px solid #000;\n}\n";
  
  struct tab_entry
  {
!   char *tab_label;
!   char *filename;
!   int(*build_body_cb)(char *, olsr_u32_t);
    olsr_bool display_tab;
  };
--- 136,146 ----
    "border: 1px solid #000;\n}\n";
  
+ typedef int(*build_body_callback)(char *, olsr_u32_t);
+ 
  struct tab_entry
  {
!   const char *tab_label;
!   const char *filename;
!   build_body_callback build_body_cb;
    olsr_bool display_tab;
  };
***************
*** 146,150 ****
  struct static_bin_file_entry
  {
!   char *filename;
    unsigned char *data;
    unsigned int data_size;
--- 148,152 ----
  struct static_bin_file_entry
  {
!   const char *filename;
    unsigned char *data;
    unsigned int data_size;
***************
*** 153,157 ****
  struct static_txt_file_entry
  {
!   char *filename;
    const char *data;
  };
--- 155,159 ----
  struct static_txt_file_entry
  {
!   const char *filename;
    const char *data;
  };
***************
*** 159,163 ****
  struct dynamic_file_entry
  {
!   char *filename;
    int(*process_data_cb)(char *, olsr_u32_t, char *, olsr_u32_t);
  };
--- 161,165 ----
  struct dynamic_file_entry
  {
!   const char *filename;
    int(*process_data_cb)(char *, olsr_u32_t, char *, olsr_u32_t);
  };
***************
*** 171,175 ****
  static int build_http_header(http_header_type, olsr_bool, olsr_u32_t, char *, olsr_u32_t);
  
! static int build_frame(char *, olsr_u32_t, char *, char *, int, int(*frame_body_cb)(char *, olsr_u32_t));
  
  static int build_routes_body(char *, olsr_u32_t);
--- 173,177 ----
  static int build_http_header(http_header_type, olsr_bool, olsr_u32_t, char *, olsr_u32_t);
  
! static int build_frame(char *, olsr_u32_t, const char *, const char *, int, build_body_callback frame_body_cb);
  
  static int build_routes_body(char *, olsr_u32_t);
***************
*** 666,673 ****
  static int build_frame(char *buf,
                         olsr_u32_t bufsize,
!                        char *title __attribute__((unused)), 
!                        char *link __attribute__((unused)), 
                         int width __attribute__((unused)),
!                        int(*frame_body_cb)(char *, olsr_u32_t))
  {
    int size = 0;
--- 668,675 ----
  static int build_frame(char *buf,
                         olsr_u32_t bufsize,
!                        const char *title __attribute__((unused)), 
!                        const char *link __attribute__((unused)), 
                         int width __attribute__((unused)),
!                        build_body_callback frame_body_cb)
  {
    int size = 0;

Index: admin_interface.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/admin_interface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin_interface.h	15 Jul 2007 17:54:07 -0000	1.3
--- admin_interface.h	16 Nov 2007 19:12:55 -0000	1.4
***************
*** 1,5 ****
  /*
   * HTTP Info plugin for the olsr.org OLSR daemon
!  * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
   * All rights reserved.
   *
--- 1,5 ----
  /*
   * HTTP Info plugin for the olsr.org OLSR daemon
!  * Copyright (c) 2004, Andreas Tønnesen((spam-protected))
   * All rights reserved.
   *