Changeset 5145:c1a3ca765154 in roaraudio for libroar/ltm.c
- Timestamp:
- 10/11/11 13:47:59 (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/ltm.c
r4873 r5145 65 65 size_t i; 66 66 67 if ( mt == 0 || streams == NULL || slen == 0 || mes == NULL || buf == NULL) {67 if ( mt == 0 ) { 68 68 roar_err_set(ROAR_ERROR_INVAL); 69 return -1; 70 } 71 72 if ( streams == NULL || slen == 0 || mes == NULL || buf == NULL ) { 73 roar_err_set(ROAR_ERROR_FAULT); 69 74 return -1; 70 75 } … … 172 177 int i; 173 178 174 if ( con == NULL ) 175 return NULL; 176 177 if ( streams == NULL || slen == 0 ) 178 return NULL; 179 if ( con == NULL ) { 180 roar_err_set(ROAR_ERROR_FAULT); 181 return NULL; 182 } 183 184 if ( streams == NULL || slen == 0 ) { 185 roar_err_set(ROAR_ERROR_FAULT); 186 return NULL; 187 } 179 188 180 189 if ( roar_ltm_pack_req(mt, window, streams, slen, &mes, &buf, ROAR_LTM_SST_GET_RAW) == -1 ) … … 238 247 } 239 248 240 #define _CKNULL(x) if ( (x) == NULL ) return -1241 #define _RETMEMBERCKED(x,m) _CKNULL(x) ;return (x)->m249 #define _CKNULL(x) if ( (x) == NULL ) { roar_err_set(ROAR_ERROR_FAULT); return -1; } 250 #define _RETMEMBERCKED(x,m) _CKNULL(x) return (x)->m 242 251 243 252 int roar_ltm_get_numstreams(struct roar_ltm_result * res) { … … 258 267 ROAR_DBG("roar_ltm_get_streamptr(res=%p, streamidx=%i) = ?", res, streamidx); 259 268 260 if ( res == NULL || streamidx < 0 || streamidx >= res->streams ) 261 return NULL; 269 if ( res == NULL || streamidx < 0 || streamidx >= res->streams ) { 270 roar_err_set(ROAR_ERROR_FAULT); 271 return NULL; 272 } 262 273 263 274 ptr = res->data; … … 294 305 ROAR_DBG("roar_ltm_extract(res=%p, mt=0x%.4x, streamidx=%i, channel=%i) = ?", res, mt, streamidx, channel); 295 306 296 if ( roar_ltm_numbits(mt) != 1 ) 297 return -1; 307 if ( roar_ltm_numbits(mt) != 1 ) { 308 roar_err_set(ROAR_ERROR_INVAL); 309 return -1; 310 } 298 311 299 312 ROAR_DBG("roar_ltm_extract(res=%p, mt=0x%.4x, streamidx=%i, channel=%i) = ?", res, mt, streamidx, channel); … … 306 319 ROAR_DBG("roar_ltm_extract(res=%p, mt=0x%.4x, streamidx=%i, channel=%i): numchans=%i", res, mt, streamidx, channel, numchans); 307 320 308 if ( channel >= numchans ) 309 return -1; 321 if ( channel >= numchans ) { 322 roar_err_set(ROAR_ERROR_RANGE); 323 return -1; 324 } 310 325 311 326 ptr++;
Note: See TracChangeset
for help on using the changeset viewer.