From: Philippe E. <ph...@us...> - 2003-10-11 13:38:54
|
Update of /cvsroot/oprofile/oprofile/libop In directory sc8-pr-cvs1:/tmp/cvs-serv2449/libop Modified Files: op_cpu_type.h op_cpu_type.c Log Message: minor cleanup in */tests/Makefile.am; add libop/tests/cpu_type_tests.c; libop/op_cpu_type.[hc] constification; utils/op_help.c: minor tidy Index: op_cpu_type.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -d -r1.16 -r1.17 --- op_cpu_type.h 10 Oct 2003 22:22:30 -0000 1.16 +++ op_cpu_type.h 11 Oct 2003 13:38:20 -0000 1.17 @@ -53,7 +53,7 @@ op_cpu op_get_cpu_type(void); * * The function returns CPU_NO_GOOD if no matching string was found. */ -op_cpu op_get_cpu_number(char *cpu_string); +op_cpu op_get_cpu_number(char const * cpu_string); /** * get the cpu string. Index: op_cpu_type.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -d -r1.22 -r1.23 --- op_cpu_type.c 10 Oct 2003 22:22:30 -0000 1.22 +++ op_cpu_type.c 11 Oct 2003 13:38:20 -0000 1.23 @@ -73,7 +73,8 @@ op_cpu op_get_cpu_type(void) return cpu_type; } -op_cpu op_get_cpu_number(char *cpu_string) + +op_cpu op_get_cpu_number(char const * cpu_string) { int cpu_type = CPU_NO_GOOD; size_t i; @@ -94,12 +95,12 @@ op_cpu op_get_cpu_number(char *cpu_strin return cpu_type; } - + + char const * op_get_cpu_type_str(op_cpu cpu_type) { - if (cpu_type < 0 || cpu_type >= MAX_CPU_TYPE) { + if (cpu_type <= CPU_NO_GOOD || cpu_type >= MAX_CPU_TYPE) return "invalid cpu type"; - } return cpu_descrs[cpu_type].pretty; } @@ -107,9 +108,8 @@ char const * op_get_cpu_type_str(op_cpu char const * op_get_cpu_name(op_cpu cpu_type) { - if (cpu_type < 0 || cpu_type >= MAX_CPU_TYPE) { + if (cpu_type <= CPU_NO_GOOD || cpu_type >= MAX_CPU_TYPE) return "invalid cpu type"; - } return cpu_descrs[cpu_type].name; } @@ -117,7 +117,7 @@ char const * op_get_cpu_name(op_cpu cpu_ int op_get_nr_counters(op_cpu cpu_type) { - if (cpu_type < 0 || cpu_type >= MAX_CPU_TYPE) + if (cpu_type <= CPU_NO_GOOD || cpu_type >= MAX_CPU_TYPE) return 0; return cpu_descrs[cpu_type].nr_counters; |