Changeset 5254:4b808f2c219c in roaraudio


Ignore:
Timestamp:
11/13/11 17:46:42 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added some more consts to DSTR and corrected proto VIO

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/vio_dstr.h

    r5253 r5254  
    181181}; 
    182182 
    183 int     roar_vio_dstr_get_type(char * str); 
    184 char *  roar_vio_dstr_get_name(int type); 
     183int           roar_vio_dstr_get_type(const char * str); 
     184const char *  roar_vio_dstr_get_name(const int type); 
    185185 
    186186int     roar_vio_dstr_register_type(int   type, 
  • include/libroar/vio_proto.h

    r4843 r5254  
    6363 
    6464int roar_vio_open_proto      (struct roar_vio_calls * calls, struct roar_vio_calls * dst, 
    65                               char * dstr, int proto, struct roar_vio_defaults * odef); 
     65                              const char * dstr, int proto, struct roar_vio_defaults * odef); 
    6666 
    6767ssize_t roar_vio_proto_read    (struct roar_vio_calls * vio, void *buf, size_t count); 
     
    7373int     roar_vio_proto_close   (struct roar_vio_calls * vio); 
    7474 
    75 int roar_vio_open_proto_http   (struct roar_vio_calls * calls, struct roar_vio_calls * dst, char * host, char * file, struct roar_userpass * up); 
    76 int roar_vio_open_proto_gopher (struct roar_vio_calls * calls, struct roar_vio_calls * dst, char * host, char * file); 
     75int roar_vio_open_proto_http   (struct roar_vio_calls * calls, struct roar_vio_calls * dst, const char * host, const char * file, struct roar_userpass * up); 
     76int roar_vio_open_proto_gopher (struct roar_vio_calls * calls, struct roar_vio_calls * dst, const char * host, const char * file); 
    7777#endif 
    7878 
  • libroar/vio_dstr.c

    r5253 r5254  
    3838#ifndef ROAR_WITHOUT_VIO_DSTR 
    3939struct _roar_vio_dstr_type { 
    40  int    id; 
    41  char * name; 
     40 const int    id; 
     41 const char * name; 
    4242 int (* setdef) (struct roar_vio_dstr_chain * cur,   struct roar_vio_dstr_chain * next); 
    4343 int (* openvio)(struct roar_vio_calls      * calls, struct roar_vio_calls      * dst, struct roar_vio_dstr_chain * cur); 
     
    225225}; 
    226226 
    227 int     roar_vio_dstr_get_type(char * str) { 
     227int     roar_vio_dstr_get_type(const char * str) { 
    228228 int i; 
    229229 
     
    247247} 
    248248 
    249 char *  roar_vio_dstr_get_name(int type) { 
     249const char *  roar_vio_dstr_get_name(const int type) { 
    250250 struct _roar_vio_dstr_type * ret; 
    251251 
  • libroar/vio_proto.c

    r5028 r5254  
    9494 
    9595int roar_vio_open_proto      (struct roar_vio_calls * calls, struct roar_vio_calls * dst, 
    96                               char * dstr, int proto, struct roar_vio_defaults * odef) { 
     96                              const char * dstr, int proto, struct roar_vio_defaults * odef) { 
    9797#ifndef ROAR_WITHOUT_VIO_PROTO 
    9898 struct roar_userpass userpass = {.subtype = -1, .user = NULL, .pass = NULL}; 
    9999 struct roar_vio_proto * self; 
    100  char * host; 
     100 const char * host; 
    101101 char * tmp; 
    102102 
     
    157157 
    158158 if ( (tmp = strstr(host, "@")) != NULL ) { 
    159   userpass.user = host; 
     159  userpass.user = (char*)host; 
    160160  *tmp = 0; 
    161161  host = tmp + 1; 
     
    481481} 
    482482 
    483 int roar_vio_open_proto_http   (struct roar_vio_calls * calls, struct roar_vio_calls * dst, char * host, char * file, struct roar_userpass * up) { 
     483int roar_vio_open_proto_http   (struct roar_vio_calls * calls, struct roar_vio_calls * dst, const char * host, const char * file, struct roar_userpass * up) { 
    484484 struct roar_keyval kv; 
    485485 struct roar_vio_proto * self; 
     
    607607 
    608608 if ( bufbuf != NULL ) { 
    609   roar_buffer_set_offset(bufbuf, endofheader - buf + oeflen); 
    610   roar_buffer_set_len(bufbuf,    len - (endofheader - buf + oeflen) - 0 /* ??? */); 
     609  if ( roar_buffer_set_offset(bufbuf, endofheader - buf + oeflen) == -1 || 
     610       roar_buffer_set_len(bufbuf,    len - (endofheader - buf + oeflen) - 0 /* ??? */) == -1 ) { 
     611   // TODO: FIXME: handle this in a better way. 
     612   ROAR_ERR("roar_vio_open_proto_http(*): Can not set data area of buffer %p, VERY BAD.", bufbuf); 
     613  } 
    611614 } 
    612615 self->reader.buffer = bufbuf; 
     
    625628} 
    626629 
    627 int roar_vio_open_proto_gopher (struct roar_vio_calls * calls, struct roar_vio_calls * dst, char * host, char * file) { 
     630int roar_vio_open_proto_gopher (struct roar_vio_calls * calls, struct roar_vio_calls * dst, const char * host, const char * file) { 
    628631 struct roar_vio_proto * self; 
    629632 char type; 
Note: See TracChangeset for help on using the changeset viewer.