Changeset 5188:15479bc3b330 in roaraudio


Ignore:
Timestamp:
10/23/11 02:02:34 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

updated error handling

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libroar/hash.c

    r4878 r5188  
    117117   return &(_libroar_hash_cmds[i]); 
    118118 
     119 roar_err_set(ROAR_ERROR_NOENT); 
    119120 return NULL; 
    120121} 
     
    149150   return _libroar_hashes[i].name; 
    150151 
     152 roar_err_set(ROAR_ERROR_NOENT); 
    151153 return NULL; 
    152154} 
     
    159161   return _libroar_hashes[i].id; 
    160162 
     163 roar_err_set(ROAR_ERROR_NOENT); 
    161164 return -1; 
    162165} 
     
    169172   return _libroar_hashes[i].dlen; 
    170173 
     174 roar_err_set(ROAR_ERROR_NOENT); 
    171175 return -1; 
    172176} 
     
    293297 
    294298 out[outlen-1] = 0; 
    295  return strlen(out); 
     299 return roar_mm_strlen(out); 
    296300} 
    297301 
     
    351355 int ret = 0; 
    352356 
    353  if ( state == NULL ) 
    354   return -1; 
     357 if ( state == NULL ) { 
     358  roar_err_set(ROAR_ERROR_FAULT); 
     359  return -1; 
     360 } 
    355361 
    356362 if ( state->cmds->uninit != NULL ) 
     
    364370 
    365371int roar_hash_digest(struct roar_hash_state * state, void * digest, size_t * len) { 
    366  if ( state == NULL ) 
    367   return -1; 
    368  
    369  if ( state->cmds->digest == NULL ) 
    370   return -1; 
     372 if ( state == NULL ) { 
     373  roar_err_set(ROAR_ERROR_FAULT); 
     374  return -1; 
     375 } 
     376 
     377 if ( state->cmds->digest == NULL ) { 
     378  roar_err_set(ROAR_ERROR_NOSYS); 
     379  return -1; 
     380 } 
    371381 
    372382 return state->cmds->digest(state->state, digest, len); 
     
    374384 
    375385int roar_hash_proc(struct roar_hash_state * state, const void * data, size_t len) { 
    376  if ( state == NULL ) 
    377   return -1; 
    378  
    379  if ( state->cmds->proc == NULL ) 
    380   return -1; 
     386 if ( state == NULL ) { 
     387  roar_err_set(ROAR_ERROR_FAULT); 
     388  return -1; 
     389 } 
     390 
     391 if ( state->cmds->proc == NULL ) { 
     392  roar_err_set(ROAR_ERROR_NOSYS); 
     393  return -1; 
     394 } 
    381395 
    382396 return state->cmds->proc(state->state, data, len); 
     
    427441 ROAR_DBG("roar_hash_salted_buffer(digest=%p, data=%p, datalen=%llu, algo=%i, salt=%p, saltlen=%llu) = ?", digest, data, (unsigned long long int)datalen, algo, salt, (unsigned long long int)saltlen); 
    428442 
    429  if ( digest == NULL || data == NULL ) 
    430   return -1; 
     443 if ( digest == NULL || data == NULL ) { 
     444  roar_err_set(ROAR_ERROR_FAULT); 
     445  return -1; 
     446 } 
    431447 
    432448 len = roar_ht_digestlen(algo); 
     
    466482 return roar_hash_salted_buffer_gcrypt(digest, data, datalen, algo, salt, saltlen); 
    467483#else 
     484 roar_err_set(ROAR_ERROR_NOTSUP); 
    468485 return -1; 
    469486#endif 
Note: See TracChangeset for help on using the changeset viewer.