Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
7c0a0617
Commit
7c0a0617
authored
May 08, 2015
by
Mike Hibler
Browse files
Fixes to rangemap testing code.
parent
f28ac182
Changes
1
Hide whitespace changes
Inline
Side-by-side
clientside/os/imagezip/imagezip.c
View file @
7c0a0617
...
...
@@ -785,8 +785,12 @@ main(int argc, char *argv[])
if
(
debug
)
dumpskips
(
debug
>
1
);
makeranges
();
#ifdef TEST_RANGEMAP
dumpranges
(
debug
>
1
);
#else
if
(
debug
)
dumpranges
(
debug
>
1
);
#endif
if
(
ranges
==
NULL
)
{
/*
* No valid ranges, exit with an error.
...
...
@@ -1330,7 +1334,7 @@ initmap(void)
int
rv
;
maplo
=
inputminsec
;
maphi
=
inputmaxsec
?
inputmaxsec
:
NDZ_HIADDR
;
maphi
=
inputmaxsec
?
(
inputmaxsec
-
1
)
:
NDZ_HIADDR
;
fprintf
(
stderr
,
"Initializing range map [%lu-%lu]
\n
"
,
maplo
,
maphi
);
rangemap
=
ndz_rangemap_init
(
maplo
,
maphi
);
...
...
@@ -1395,8 +1399,6 @@ verifyfunc(struct ndz_rangemap *imap, struct ndz_range *range, void *arg)
static
void
comparemap
(
int
verbose
)
{
struct
range
*
currange
=
ranges
;
/* XXX adjust max */
if
(
inputmaxsec
!=
0
)
ndz_rangemap_dealloc
(
rangemap
,
inputmaxsec
,
...
...
@@ -1404,12 +1406,16 @@ comparemap(int verbose)
ndz_rangemap_dump
(
rangemap
,
verbose
?
0
:
1
,
NULL
);
/* ranges should be 1-to-1 with map ranges */
if
(
ndz_rangemap_iterate
(
rangemap
,
verifyfunc
,
&
currange
))
fprintf
(
stderr
,
"*** Maps differ!
\n
"
);
if
(
currange
!=
NULL
)
fprintf
(
stderr
,
"*** More iz ranges starting at %u!
\n
"
,
currange
->
start
);
if
(
frangesize
==
0
)
{
struct
range
*
currange
=
ranges
;
/* ranges should be 1-to-1 with map ranges */
if
(
ndz_rangemap_iterate
(
rangemap
,
verifyfunc
,
&
currange
))
fprintf
(
stderr
,
"*** Maps differ!
\n
"
);
if
(
currange
!=
NULL
)
fprintf
(
stderr
,
"*** More iz ranges starting at %u!
\n
"
,
currange
->
start
);
}
}
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment