Changeset 5216:e16c15116d46 in roaraudio
- Timestamp:
- 11/12/11 10:43:46 (12 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r5214 r5216 1 1 v. 1.0beta0 - ? 2 * Updated API (SONAME change) (Closes: #184) 2 3 3 4 v. 0.4 - Fri Nov 11 2011 20:12 CET -
include/libroar/error.h
r5215 r5216 73 73 struct roar_error_frame * roar_err_errorframe(void); 74 74 75 int roar_err_int(struct roar_error_frame * frame);76 75 int 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); 76 void * roar_err_buildmsg(struct roar_message * mes, void ** data, struct roar_error_frame * frame); 77 int roar_err_parsemsg(struct roar_message * mes, void * data, struct roar_error_frame * frame); 81 78 82 79 #define roar_error (*roar_errno2()) -
libroar/error.c
r5215 r5216 60 60 } 61 61 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 }66 62 int roar_err_init(struct roar_error_frame * frame) { 67 63 if ( frame == NULL ) { … … 83 79 84 80 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) { 81 void * roar_err_buildmsg(struct roar_message * mes, void ** data, struct roar_error_frame * frame) { 90 82 char * databuf = NULL; 91 83 int16_t * d; … … 137 129 } 138 130 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) { 131 int roar_err_parsemsg(struct roar_message * mes, void * data, struct roar_error_frame * frame) { 144 132 char * databuf = (char *)data; 145 133 int16_t * d; -
libroar/proto.c
r5146 r5216 257 257 roar_err_clear(); 258 258 if ( mes->cmd == ROAR_CMD_ERROR && errorframe != NULL ) { 259 if ( roar_err_parsemsg 2(mes, *data, errorframe) != 0 ) {259 if ( roar_err_parsemsg(mes, *data, errorframe) != 0 ) { 260 260 roar_err_init(errorframe); 261 261 } … … 290 290 roar_err_clear(); 291 291 if ( mes->cmd == ROAR_CMD_ERROR && errorframe != NULL ) { 292 if ( roar_err_parsemsg 2(mes, *data, errorframe) != 0 ) {292 if ( roar_err_parsemsg(mes, *data, errorframe) != 0 ) { 293 293 roar_err_init(errorframe); 294 294 } -
roard/req.c
r5164 r5216 167 167 error_frame.datalen = error_mes.datalen; 168 168 169 error_data = roar_err_buildmsg(mes, &error_frame);169 error_data = roar_err_buildmsg(mes, NULL, &error_frame); 170 170 ROAR_DBG("req_on_auth(client=%i,...): error_data=%p", client, error_data); 171 171
Note: See TracChangeset
for help on using the changeset viewer.