@@ -11271,7 +11271,7 @@ main(int argc, char **argv)
11271
11271
fts .max_depth = 5 ;
11272
11272
paths_found = find_paths (paths , "test_jparse" , -1 , & cwd , false, & fts );
11273
11273
if (paths_found == NULL ) {
11274
- err (208 , __func__ , "didn't find any paths in the paths array" );
11274
+ err (210 , __func__ , "didn't find any paths in the paths array" );
11275
11275
not_reached ();
11276
11276
}
11277
11277
@@ -11285,7 +11285,7 @@ main(int argc, char **argv)
11285
11285
/* get next string pointer */
11286
11286
name = dyn_array_value (paths_found , char * , j );
11287
11287
if (name == NULL ) { /* paranoia */
11288
- err (209 , __func__ , "found NULL pointer at paths_found[%ju]" , (uintmax_t )j );
11288
+ err (211 , __func__ , "found NULL pointer at paths_found[%ju]" , (uintmax_t )j );
11289
11289
not_reached ();
11290
11290
}
11291
11291
@@ -11332,7 +11332,7 @@ main(int argc, char **argv)
11332
11332
fts .max_depth = 3 ;
11333
11333
paths_found = find_paths (paths , "test_jparse" , -1 , & cwd , false, & fts );
11334
11334
if (paths_found == NULL ) {
11335
- err (208 , __func__ , "didn't find any paths in the paths array" );
11335
+ err (212 , __func__ , "didn't find any paths in the paths array" );
11336
11336
not_reached ();
11337
11337
}
11338
11338
@@ -11346,7 +11346,7 @@ main(int argc, char **argv)
11346
11346
/* get next string pointer */
11347
11347
name = dyn_array_value (paths_found , char * , j );
11348
11348
if (name == NULL ) { /* paranoia */
11349
- err (209 , __func__ , "found NULL pointer at paths_found[%ju]" , (uintmax_t )j );
11349
+ err (213 , __func__ , "found NULL pointer at paths_found[%ju]" , (uintmax_t )j );
11350
11350
not_reached ();
11351
11351
}
11352
11352
@@ -11395,7 +11395,7 @@ main(int argc, char **argv)
11395
11395
fts .max_depth = 0 ;
11396
11396
paths_found = find_paths (paths , "test_jparse" , -1 , & cwd , false, & fts );
11397
11397
if (paths_found == NULL ) {
11398
- err (208 , __func__ , "didn't find any paths in the paths array" );
11398
+ err (214 , __func__ , "didn't find any paths in the paths array" );
11399
11399
not_reached ();
11400
11400
}
11401
11401
@@ -11409,7 +11409,7 @@ main(int argc, char **argv)
11409
11409
/* get next string pointer */
11410
11410
name = dyn_array_value (paths_found , char * , j );
11411
11411
if (name == NULL ) { /* paranoia */
11412
- err (209 , __func__ , "found NULL pointer at paths_found[%ju]" , (uintmax_t )j );
11412
+ err (215 , __func__ , "found NULL pointer at paths_found[%ju]" , (uintmax_t )j );
11413
11413
not_reached ();
11414
11414
}
11415
11415
@@ -11460,7 +11460,7 @@ main(int argc, char **argv)
11460
11460
fts .max_depth = 3 ;
11461
11461
paths_found = find_paths (paths , "test_jparse" , -1 , & cwd , false, & fts );
11462
11462
if (paths_found != NULL ) {
11463
- err (208 , __func__ , "bogus range of min/max directories found directories" );
11463
+ err (216 , __func__ , "bogus range of min/max directories found directories" );
11464
11464
not_reached ();
11465
11465
}
11466
11466
@@ -11489,7 +11489,7 @@ main(int argc, char **argv)
11489
11489
fts .match_case = true;
11490
11490
paths_found = find_paths (paths , "test_jparse" , -1 , & cwd , false, & fts );
11491
11491
if (paths_found != NULL ) {
11492
- err (210 , __func__ , "found unexpected socket under test_jparse/" );
11492
+ err (217 , __func__ , "found unexpected socket under test_jparse/" );
11493
11493
not_reached ();
11494
11494
}
11495
11495
@@ -11521,7 +11521,7 @@ main(int argc, char **argv)
11521
11521
fts .match_case = true;
11522
11522
paths_found = find_paths (paths , "test_jparse" , -1 , & cwd , false, & fts );
11523
11523
if (paths_found != NULL ) {
11524
- err (211 , __func__ , "found unexpected character device under test_jparse/" );
11524
+ err (218 , __func__ , "found unexpected character device under test_jparse/" );
11525
11525
not_reached ();
11526
11526
}
11527
11527
@@ -11554,7 +11554,7 @@ main(int argc, char **argv)
11554
11554
fts .match_case = true;
11555
11555
paths_found = find_paths (paths , "test_jparse" , -1 , & cwd , false, & fts );
11556
11556
if (paths_found != NULL ) {
11557
- err (212 , __func__ , "found unexpected block device under test_jparse/" );
11557
+ err (219 , __func__ , "found unexpected block device under test_jparse/" );
11558
11558
not_reached ();
11559
11559
}
11560
11560
@@ -11581,7 +11581,7 @@ main(int argc, char **argv)
11581
11581
fts .match_case = false;
11582
11582
paths_found = find_paths (paths , "test_jparse" , -1 , & cwd , false, & fts );
11583
11583
if (paths_found != NULL ) {
11584
- err (213 , __func__ , "found unexpected FIFO under test_jparse/" );
11584
+ err (220 , __func__ , "found unexpected FIFO under test_jparse/" );
11585
11585
not_reached ();
11586
11586
}
11587
11587
@@ -11621,15 +11621,15 @@ main(int argc, char **argv)
11621
11621
for (j = 0 ; j < len ; ++ j ) {
11622
11622
name = dyn_array_value (paths_found , char * , j );
11623
11623
if (name == NULL ) {
11624
- err (214 , __func__ , "found NULL pointer in paths_found (not file, directory or symlink) array" );
11624
+ err (221 , __func__ , "found NULL pointer in paths_found (not file, directory or symlink) array" );
11625
11625
not_reached ();
11626
11626
}
11627
11627
warn (__func__ , "path is not a file, directory or symlink: %s" , name );
11628
11628
}
11629
11629
/*
11630
11630
* make it an error
11631
11631
*/
11632
- err (215 , __func__ , "found unexpected file type under test_jparse/" );
11632
+ err (222 , __func__ , "found unexpected file type under test_jparse/" );
11633
11633
not_reached ();
11634
11634
}
11635
11635
@@ -11669,7 +11669,7 @@ main(int argc, char **argv)
11669
11669
relpath = "foobar" ;
11670
11670
touch (relpath , S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH );
11671
11671
if (!exists (relpath )) {
11672
- err (216 , __func__ , "file %s does not exist after touch()" , relpath );
11672
+ err (223 , __func__ , "file %s does not exist after touch()" , relpath );
11673
11673
not_reached ();
11674
11674
}
11675
11675
@@ -11693,17 +11693,17 @@ main(int argc, char **argv)
11693
11693
for (j = 0 ; j < len ; ++ j ) {
11694
11694
name = dyn_array_value (paths_found , char * , j );
11695
11695
if (name == NULL ) {
11696
- err (217 , __func__ , "found NULL pointer in paths_found (any) array" );
11696
+ err (224 , __func__ , "found NULL pointer in paths_found (any) array" );
11697
11697
not_reached ();
11698
11698
}
11699
11699
if (strcmp (relpath , name ) != 0 ) {
11700
- err (218 , __func__ , "found non-matching file in list: %s != %s" , name , relpath );
11700
+ err (225 , __func__ , "found non-matching file in list: %s != %s" , name , relpath );
11701
11701
not_reached ();
11702
11702
}
11703
11703
fdbg (stderr , DBG_MED , "found file %s as case-sensitive search" , name );
11704
11704
}
11705
11705
} else {
11706
- err (219 , __func__ , "couldn't find any file called \"%s\" as case-sensitive search" , relpath );
11706
+ err (226 , __func__ , "couldn't find any file called \"%s\" as case-sensitive search" , relpath );
11707
11707
not_reached ();
11708
11708
}
11709
11709
@@ -11742,18 +11742,18 @@ main(int argc, char **argv)
11742
11742
for (j = 0 ; j < len ; ++ j ) {
11743
11743
name = dyn_array_value (paths_found , char * , j );
11744
11744
if (name == NULL ) {
11745
- err (220 , __func__ , "found NULL pointer in paths_found (any) array" );
11745
+ err (227 , __func__ , "found NULL pointer in paths_found (any) array" );
11746
11746
not_reached ();
11747
11747
}
11748
11748
if (strcasecmp (relpath , name ) != 0 ) {
11749
- err (221 , __func__ , "found non-matching file in list: %s != %s" , name , relpath );
11749
+ err (228 , __func__ , "found non-matching file in list: %s != %s" , name , relpath );
11750
11750
not_reached ();
11751
11751
}
11752
11752
11753
11753
fdbg (stderr , DBG_MED , "found %s by case-insensitive search" , name );
11754
11754
}
11755
11755
} else {
11756
- err (222 , __func__ , "couldn't find any file called \"%s\" by case-insensitive search" , relpath );
11756
+ err (229 , __func__ , "couldn't find any file called \"%s\" by case-insensitive search" , relpath );
11757
11757
not_reached ();
11758
11758
}
11759
11759
@@ -11763,7 +11763,7 @@ main(int argc, char **argv)
11763
11763
errno = 0 ; /* pre-clear errno for errp() */
11764
11764
if (unlink (relpath ) != 0 ) {
11765
11765
if (errno != ENOENT ) {
11766
- errp (223 , __func__ , "unable to delete file %s" , relpath );
11766
+ errp (230 , __func__ , "unable to delete file %s" , relpath );
11767
11767
not_reached ();
11768
11768
}
11769
11769
} else {
@@ -11805,7 +11805,7 @@ main(int argc, char **argv)
11805
11805
* make sure it exists
11806
11806
*/
11807
11807
if (!exists (relpath )) {
11808
- err (224 , __func__ , "file %s does not exist" , relpath );
11808
+ err (231 , __func__ , "file %s does not exist" , relpath );
11809
11809
not_reached ();
11810
11810
}
11811
11811
@@ -11843,7 +11843,7 @@ main(int argc, char **argv)
11843
11843
for (j = 0 ; j < len ; ++ j ) {
11844
11844
name = dyn_array_value (paths_found , char * , j );
11845
11845
if (name == NULL ) {
11846
- err (225 , __func__ , "found NULL pointer in paths_found (any) array" );
11846
+ err (232 , __func__ , "found NULL pointer in paths_found (any) array" );
11847
11847
not_reached ();
11848
11848
}
11849
11849
fdbg (stderr , DBG_MED , "found file %s as case-sensitive search" , name );
@@ -11892,11 +11892,11 @@ main(int argc, char **argv)
11892
11892
for (j = 0 ; j < len ; ++ j ) {
11893
11893
name = dyn_array_value (paths_found , char * , j );
11894
11894
if (name == NULL ) {
11895
- err (226 , __func__ , "found NULL pointer in paths_found array" );
11895
+ err (233 , __func__ , "found NULL pointer in paths_found array" );
11896
11896
not_reached ();
11897
11897
}
11898
11898
if (strcasecmp (relpath , name ) != 0 ) {
11899
- err (227 , __func__ , "found non-matching file: %s != %s" , name , relpath );
11899
+ err (234 , __func__ , "found non-matching file: %s != %s" , name , relpath );
11900
11900
not_reached ();
11901
11901
}
11902
11902
fdbg (stderr , DBG_MED , "found %s by case-insensitive search" , name );
@@ -11905,7 +11905,7 @@ main(int argc, char **argv)
11905
11905
/*
11906
11906
* as it is a case-insensitive it should always succeed
11907
11907
*/
11908
- err (228 , __func__ , "couldn't find any file called %s by case-insensitive search" , relpath );
11908
+ err (235 , __func__ , "couldn't find any file called %s by case-insensitive search" , relpath );
11909
11909
not_reached ();
11910
11910
}
11911
11911
@@ -11935,7 +11935,7 @@ main(int argc, char **argv)
11935
11935
free (fname );
11936
11936
fname = NULL ;
11937
11937
} else {
11938
- err (229 , __func__ , "couldn't find %s in tree" , relpath );
11938
+ err (236 , __func__ , "couldn't find %s in tree" , relpath );
11939
11939
not_reached ();
11940
11940
}
11941
11941
@@ -11946,7 +11946,7 @@ main(int argc, char **argv)
11946
11946
errno = 0 ; /* pre-clear errno for errp() */
11947
11947
if (unlink (relpath ) != 0 ) {
11948
11948
if (errno != ENOENT ) {
11949
- errp (230 , __func__ , "unable to delete file %s" , relpath );
11949
+ errp (237 , __func__ , "unable to delete file %s" , relpath );
11950
11950
not_reached ();
11951
11951
}
11952
11952
} else {
0 commit comments