diff options
Diffstat (limited to 'tests/test-dict-values.c')
| -rw-r--r-- | tests/test-dict-values.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/test-dict-values.c b/tests/test-dict-values.c index 8fece04..e324345 100644 --- a/tests/test-dict-values.c +++ b/tests/test-dict-values.c | |||
| @@ -193,7 +193,7 @@ main( | |||
| 193 | ); | 193 | ); |
| 194 | if ((attr = tinyrad_dict_attr_get(dict, value_def->attr_name, 0, NULL, 0, 0)) == NULL) | 194 | if ((attr = tinyrad_dict_attr_get(dict, value_def->attr_name, 0, NULL, 0, 0)) == NULL) |
| 195 | { | 195 | { |
| 196 | our_error(opts, NULL, "%s: %s: unable to retrieve attribute", value_def->attr_name, value_def->value_name); | 196 | trutils_error(opts, NULL, "%s: %s: unable to retrieve attribute", value_def->attr_name, value_def->value_name); |
| 197 | tinyrad_free(attr); | 197 | tinyrad_free(attr); |
| 198 | tinyrad_free(dict); | 198 | tinyrad_free(dict); |
| 199 | return(1); | 199 | return(1); |
| @@ -223,7 +223,7 @@ main( | |||
| 223 | ); | 223 | ); |
| 224 | if ((attr = tinyrad_dict_attr_get(dict, value_def->attr_name, 0, NULL, 0, 0)) == NULL) | 224 | if ((attr = tinyrad_dict_attr_get(dict, value_def->attr_name, 0, NULL, 0, 0)) == NULL) |
| 225 | { | 225 | { |
| 226 | our_error(opts, NULL, "%s: %s: unable to retrieve attribute", value_def->attr_name, value_def->value_name); | 226 | trutils_error(opts, NULL, "%s: %s: unable to retrieve attribute", value_def->attr_name, value_def->value_name); |
| 227 | tinyrad_free(attr); | 227 | tinyrad_free(attr); |
| 228 | tinyrad_free(dict); | 228 | tinyrad_free(dict); |
| 229 | return(1); | 229 | return(1); |
| @@ -253,7 +253,7 @@ main( | |||
| 253 | ); | 253 | ); |
| 254 | if ((attr = tinyrad_dict_attr_get(dict, value_def->attr_name, 0, NULL, 0, 0)) == NULL) | 254 | if ((attr = tinyrad_dict_attr_get(dict, value_def->attr_name, 0, NULL, 0, 0)) == NULL) |
| 255 | { | 255 | { |
| 256 | our_error(opts, NULL, "%s: %s: unable to retrieve attribute", value_def->attr_name, value_def->value_name); | 256 | trutils_error(opts, NULL, "%s: %s: unable to retrieve attribute", value_def->attr_name, value_def->value_name); |
| 257 | tinyrad_free(attr); | 257 | tinyrad_free(attr); |
| 258 | tinyrad_free(dict); | 258 | tinyrad_free(dict); |
| 259 | return(1); | 259 | return(1); |
| @@ -283,7 +283,7 @@ main( | |||
| 283 | ); | 283 | ); |
| 284 | if ((attr = tinyrad_dict_attr_get(dict, value_def->attr_name, 0, NULL, 0, 0)) == NULL) | 284 | if ((attr = tinyrad_dict_attr_get(dict, value_def->attr_name, 0, NULL, 0, 0)) == NULL) |
| 285 | { | 285 | { |
| 286 | our_error(opts, NULL, "%s: %s: unable to retrieve attribute", value_def->attr_name, value_def->value_name); | 286 | trutils_error(opts, NULL, "%s: %s: unable to retrieve attribute", value_def->attr_name, value_def->value_name); |
| 287 | tinyrad_free(attr); | 287 | tinyrad_free(attr); |
| 288 | tinyrad_free(dict); | 288 | tinyrad_free(dict); |
| 289 | return(1); | 289 | return(1); |
| @@ -327,7 +327,7 @@ my_verify_value( | |||
| 327 | if (!(value)) | 327 | if (!(value)) |
| 328 | { | 328 | { |
| 329 | our_dict_diag_value(opts, value_def, value); | 329 | our_dict_diag_value(opts, value_def, value); |
| 330 | return(our_error(opts, NULL, "value was not found")); | 330 | return(trutils_error(opts, NULL, "value was not found")); |
| 331 | }; | 331 | }; |
| 332 | 332 | ||
| 333 | //// compare value names | 333 | //// compare value names |
| @@ -336,7 +336,7 @@ my_verify_value( | |||
| 336 | //{ | 336 | //{ |
| 337 | // tinyrad_free(str); | 337 | // tinyrad_free(str); |
| 338 | // our_dict_diag_value(opts, def, value); | 338 | // our_dict_diag_value(opts, def, value); |
| 339 | // return(our_error(opts, NULL, "value names do not match")); | 339 | // return(trutils_error(opts, NULL, "value names do not match")); |
| 340 | //}; | 340 | //}; |
| 341 | //tinyrad_free(str); | 341 | //tinyrad_free(str); |
| 342 | 342 | ||
| @@ -346,7 +346,7 @@ my_verify_value( | |||
| 346 | //{ | 346 | //{ |
| 347 | // tinyrad_free(str); | 347 | // tinyrad_free(str); |
| 348 | // our_dict_diag_value(opts, def, value); | 348 | // our_dict_diag_value(opts, def, value); |
| 349 | // return(our_error(opts, NULL, "value names do not match")); | 349 | // return(trutils_error(opts, NULL, "value names do not match")); |
| 350 | //}; | 350 | //}; |
| 351 | //tinyrad_free(str); | 351 | //tinyrad_free(str); |
| 352 | 352 | ||
| @@ -356,7 +356,7 @@ my_verify_value( | |||
| 356 | if (a_u8 != v_u8) | 356 | if (a_u8 != v_u8) |
| 357 | { | 357 | { |
| 358 | our_dict_diag_value(opts, value_def, value); | 358 | our_dict_diag_value(opts, value_def, value); |
| 359 | return(our_error(opts, NULL, "attribute type does not match")); | 359 | return(trutils_error(opts, NULL, "attribute type does not match")); |
| 360 | }; | 360 | }; |
| 361 | 361 | ||
| 362 | // compare attribute vendor ID | 362 | // compare attribute vendor ID |
| @@ -365,7 +365,7 @@ my_verify_value( | |||
| 365 | if (a_u32 != v_u32) | 365 | if (a_u32 != v_u32) |
| 366 | { | 366 | { |
| 367 | our_dict_diag_value(opts, value_def, value); | 367 | our_dict_diag_value(opts, value_def, value); |
| 368 | return(our_error(opts, NULL, "attribute vendor id does not match")); | 368 | return(trutils_error(opts, NULL, "attribute vendor id does not match")); |
| 369 | }; | 369 | }; |
| 370 | 370 | ||
| 371 | // compare attribute vendor type | 371 | // compare attribute vendor type |
| @@ -374,7 +374,7 @@ my_verify_value( | |||
| 374 | if (a_u32 != v_u32) | 374 | if (a_u32 != v_u32) |
| 375 | { | 375 | { |
| 376 | our_dict_diag_value(opts, value_def, value); | 376 | our_dict_diag_value(opts, value_def, value); |
| 377 | return(our_error(opts, NULL, "attribute vendor type does not match")); | 377 | return(trutils_error(opts, NULL, "attribute vendor type does not match")); |
| 378 | }; | 378 | }; |
| 379 | 379 | ||
| 380 | // compare value data | 380 | // compare value data |
| @@ -382,7 +382,7 @@ my_verify_value( | |||
| 382 | if (value_def->data != u64) | 382 | if (value_def->data != u64) |
| 383 | { | 383 | { |
| 384 | our_dict_diag_value(opts, value_def, value); | 384 | our_dict_diag_value(opts, value_def, value); |
| 385 | return(our_error(opts, NULL, "value data does not match")); | 385 | return(trutils_error(opts, NULL, "value data does not match")); |
| 386 | }; | 386 | }; |
| 387 | 387 | ||
| 388 | return(0); | 388 | return(0); |
