Changeset 5216:e16c15116d46 in roaraudio


Ignore:
Timestamp:
11/12/11 10:43:46 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

moved roar_err_{build,parse}msg2() -> roar_err_{build,parse}msg(), see #184

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r5214 r5216  
    11v. 1.0beta0 - ? 
     2        * Updated API (SONAME change) (Closes: #184) 
    23 
    34v. 0.4 - Fri Nov 11 2011 20:12 CET 
  • include/libroar/error.h

    r5215 r5216  
    7373struct roar_error_frame * roar_err_errorframe(void); 
    7474 
    75 int    roar_err_int(struct roar_error_frame * frame); 
    7675int    roar_err_init(struct roar_error_frame * frame); 
    77 void * roar_err_buildmsg2(struct roar_message * mes, void ** data, struct roar_error_frame * frame); 
    78 int    roar_err_parsemsg2(struct roar_message * mes, void *  data, struct roar_error_frame * frame); 
    79 void * roar_err_buildmsg(struct roar_message * mes, struct roar_error_frame * frame); 
    80 int    roar_err_parsemsg(struct roar_message * mes, struct roar_error_frame * frame); 
     76void * roar_err_buildmsg(struct roar_message * mes, void ** data, struct roar_error_frame * frame); 
     77int    roar_err_parsemsg(struct roar_message * mes, void *  data, struct roar_error_frame * frame); 
    8178 
    8279#define roar_error (*roar_errno2()) 
  • libroar/error.c

    r5215 r5216  
    6060} 
    6161 
    62 int    roar_err_int(struct roar_error_frame * frame) { 
    63  roar_debug_warn_obsolete("roar_err_int", "roar_err_init", NULL); 
    64  return roar_err_init(frame); 
    65 } 
    6662int    roar_err_init(struct roar_error_frame * frame) { 
    6763 if ( frame == NULL ) { 
     
    8379 
    8480 
    85 void * roar_err_buildmsg(struct roar_message * mes, struct roar_error_frame * frame) { 
    86  roar_debug_warn_obsolete("roar_err_buildmsg", "roar_err_buildmsg2", NULL); 
    87  return roar_err_buildmsg2(mes, NULL, frame); 
    88 } 
    89 void * roar_err_buildmsg2(struct roar_message * mes, void ** data, struct roar_error_frame * frame) { 
     81void * roar_err_buildmsg(struct roar_message * mes, void ** data, struct roar_error_frame * frame) { 
    9082 char * databuf = NULL; 
    9183 int16_t * d; 
     
    137129} 
    138130 
    139 int    roar_err_parsemsg(struct roar_message * mes, struct roar_error_frame * frame) { 
    140  roar_debug_warn_obsolete("roar_err_parsemsg", "roar_err_parsemsg", NULL); 
    141  return roar_err_parsemsg2(mes, NULL, frame); 
    142 } 
    143 int    roar_err_parsemsg2(struct roar_message * mes, void *  data, struct roar_error_frame * frame) { 
     131int    roar_err_parsemsg(struct roar_message * mes, void *  data, struct roar_error_frame * frame) { 
    144132 char * databuf = (char *)data; 
    145133 int16_t * d; 
  • libroar/proto.c

    r5146 r5216  
    257257   roar_err_clear(); 
    258258   if ( mes->cmd == ROAR_CMD_ERROR && errorframe != NULL ) { 
    259     if ( roar_err_parsemsg2(mes, *data, errorframe) != 0 ) { 
     259    if ( roar_err_parsemsg(mes, *data, errorframe) != 0 ) { 
    260260     roar_err_init(errorframe); 
    261261    } 
     
    290290   roar_err_clear(); 
    291291   if ( mes->cmd == ROAR_CMD_ERROR && errorframe != NULL ) { 
    292     if ( roar_err_parsemsg2(mes, *data, errorframe) != 0 ) { 
     292    if ( roar_err_parsemsg(mes, *data, errorframe) != 0 ) { 
    293293     roar_err_init(errorframe); 
    294294    } 
  • roard/req.c

    r5164 r5216  
    167167   error_frame.datalen  = error_mes.datalen; 
    168168 
    169    error_data   = roar_err_buildmsg(mes, &error_frame); 
     169   error_data   = roar_err_buildmsg(mes, NULL, &error_frame); 
    170170   ROAR_DBG("req_on_auth(client=%i,...): error_data=%p", client, error_data); 
    171171 
Note: See TracChangeset for help on using the changeset viewer.