put call to exit() back in, now that it's implemented
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1614 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
4614b80ee6
commit
2050c9bb7c
@ -1,6 +1,6 @@
|
|||||||
#include <OS.h>
|
#include <OS.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
//#include <stdlib.h> -- when exit() is implemented
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "cpuinfo.h"
|
#include "cpuinfo.h"
|
||||||
@ -21,7 +21,7 @@ usage()
|
|||||||
" -f supported processor features\n"
|
" -f supported processor features\n"
|
||||||
" -t TLB and cache info\n"
|
" -t TLB and cache info\n"
|
||||||
" -d dump registers from CPUID calls\n");
|
" -d dump registers from CPUID calls\n");
|
||||||
//exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ getoption(char *optstr)
|
|||||||
|| (strlen(optstr) > 2)
|
|| (strlen(optstr) > 2)
|
||||||
|| (strchr("iftd", optstr[1]) == NULL))
|
|| (strchr("iftd", optstr[1]) == NULL))
|
||||||
// invalid option
|
// invalid option
|
||||||
return 0;
|
usage();
|
||||||
|
|
||||||
return optstr[1];
|
return optstr[1];
|
||||||
}
|
}
|
||||||
@ -57,11 +57,8 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
if (argc == 2)
|
if (argc == 2)
|
||||||
option = getoption(argv[1]);
|
option = getoption(argv[1]);
|
||||||
|
else
|
||||||
if (option == 0) {
|
|
||||||
usage();
|
usage();
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// get initial info (max_level and vendor_tag)
|
// get initial info (max_level and vendor_tag)
|
||||||
get_cpuid(info, 0, 0);
|
get_cpuid(info, 0, 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user