aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tests/test-oid-str.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-oid-str.c')
-rw-r--r--tests/test-oid-str.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/test-oid-str.c b/tests/test-oid-str.c
index 76b93d3..9e79ebb 100644
--- a/tests/test-oid-str.c
+++ b/tests/test-oid-str.c
@@ -215,7 +215,7 @@ int main(int argc, char * argv[])
215 trutils_verbose(opts, " Initializing OID from values ..."); 215 trutils_verbose(opts, " Initializing OID from values ...");
216 if ((oid = tinyrad_oid_init(test_vals[x].vals, y)) == NULL) 216 if ((oid = tinyrad_oid_init(test_vals[x].vals, y)) == NULL)
217 { 217 {
218 our_error(opts, NULL, "out of virtual memory"); 218 trutils_error(opts, NULL, "out of virtual memory");
219 errs++; 219 errs++;
220 continue; 220 continue;
221 }; 221 };
@@ -223,14 +223,14 @@ int main(int argc, char * argv[])
223 trutils_verbose(opts, " Testing values of OID ..."); 223 trutils_verbose(opts, " Testing values of OID ...");
224 if ((rc = tinyrad_oid_values(oid, &vals, &len)) != TRAD_SUCCESS) 224 if ((rc = tinyrad_oid_values(oid, &vals, &len)) != TRAD_SUCCESS)
225 { 225 {
226 our_error(opts, NULL, "tinyrad_oid_values(): %s", tinyrad_strerror(rc)); 226 trutils_error(opts, NULL, "tinyrad_oid_values(): %s", tinyrad_strerror(rc));
227 errs++; 227 errs++;
228 tinyrad_free(oid); 228 tinyrad_free(oid);
229 continue; 229 continue;
230 }; 230 };
231 if (len != y) 231 if (len != y)
232 { 232 {
233 our_error(opts, NULL, "OID length does not match reference"); 233 trutils_error(opts, NULL, "OID length does not match reference");
234 errs++; 234 errs++;
235 tinyrad_free(oid); 235 tinyrad_free(oid);
236 continue; 236 continue;
@@ -239,7 +239,7 @@ int main(int argc, char * argv[])
239 { 239 {
240 if (test_vals[x].vals[pos] != vals[pos]) 240 if (test_vals[x].vals[pos] != vals[pos])
241 { 241 {
242 our_error(opts, NULL, "OID values do not match reference"); 242 trutils_error(opts, NULL, "OID values do not match reference");
243 errs++; 243 errs++;
244 pos = y; 244 pos = y;
245 }; 245 };
@@ -311,7 +311,7 @@ my_oid_test(
311 trutils_verbose(opts, " Generating %s ...", title); 311 trutils_verbose(opts, " Generating %s ...", title);
312 if ((str = tinyrad_oid2str(oldoid, type)) == NULL) 312 if ((str = tinyrad_oid2str(oldoid, type)) == NULL)
313 { 313 {
314 our_error(opts, NULL, "out of virtual memory"); 314 trutils_error(opts, NULL, "out of virtual memory");
315 return(1); 315 return(1);
316 }; 316 };
317 trutils_verbose(opts, " %s: %s", title, str); 317 trutils_verbose(opts, " %s: %s", title, str);
@@ -319,7 +319,7 @@ my_oid_test(
319 trutils_verbose(opts, " Generating OID from %s ...", title); 319 trutils_verbose(opts, " Generating OID from %s ...", title);
320 if ((newoid = tinyrad_str2oid(str)) == NULL) 320 if ((newoid = tinyrad_str2oid(str)) == NULL)
321 { 321 {
322 our_error(opts, NULL, "error generating OID from %s", title); 322 trutils_error(opts, NULL, "error generating OID from %s", title);
323 tinyrad_free(str); 323 tinyrad_free(str);
324 return(1); 324 return(1);
325 }; 325 };
@@ -331,7 +331,7 @@ my_oid_test(
331 trutils_verbose(opts, " Generated OID: %s", my_oidstr(newvals, newlen)); 331 trutils_verbose(opts, " Generated OID: %s", my_oidstr(newvals, newlen));
332 if (newlen != oldlen) 332 if (newlen != oldlen)
333 { 333 {
334 our_error(opts, NULL, "old and new OID lengths do not match"); 334 trutils_error(opts, NULL, "old and new OID lengths do not match");
335 tinyrad_free(newoid); 335 tinyrad_free(newoid);
336 tinyrad_free(newvals); 336 tinyrad_free(newvals);
337 tinyrad_free(oldvals); 337 tinyrad_free(oldvals);
@@ -341,7 +341,7 @@ my_oid_test(
341 { 341 {
342 if (newvals[pos] != oldvals[pos]) 342 if (newvals[pos] != oldvals[pos])
343 { 343 {
344 our_error(opts, NULL, "old and new OID values do not match"); 344 trutils_error(opts, NULL, "old and new OID values do not match");
345 tinyrad_free(newoid); 345 tinyrad_free(newoid);
346 tinyrad_free(newvals); 346 tinyrad_free(newvals);
347 tinyrad_free(oldvals); 347 tinyrad_free(oldvals);
@@ -353,7 +353,7 @@ my_oid_test(
353 if ((tinyrad_oid_cmp(&oldoid, &newoid))) 353 if ((tinyrad_oid_cmp(&oldoid, &newoid)))
354 { 354 {
355 tinyrad_free(newoid); 355 tinyrad_free(newoid);
356 our_error(opts, NULL, "old OID does not match new OID"); 356 trutils_error(opts, NULL, "old OID does not match new OID");
357 return(1); 357 return(1);
358 }; 358 };
359 359