From f12ec081ceea22e9a0bbce317e91c69e56ba784e Mon Sep 17 00:00:00 2001
From: Kristof Szabados <Kristof.Szabados@ericsson.com>
Date: Wed, 23 Nov 2016 18:39:43 +0100
Subject: [PATCH] checked which parameters and return values are actually
unsigned.
Signed-off-by: Kristof Szabados <Kristof.Szabados@ericsson.com>
---
core/Profiler.cc | 20 ++++++++++----------
core/Profiler.hh | 14 +++++++-------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/core/Profiler.cc b/core/Profiler.cc
index 884d24678..76e4255ea 100644
--- a/core/Profiler.cc
+++ b/core/Profiler.cc
@@ -273,7 +273,7 @@ void TTCN3_Profiler::enter_function(const char* filename, int lineno)
execute_line(filename, lineno);
if (!stopped) {
- int element = get_element(filename);
+ unsigned int element = get_element(filename);
// store function data
if (!disable_coverage) {
@@ -310,7 +310,7 @@ void TTCN3_Profiler::execute_line(const char* filename, int lineno)
// also, several instructions could be in the same line, only count the line once
if (0 != lineno && !disable_coverage && (lineno != prev_line || NULL == prev_file ||
0 != strcmp(prev_file, filename))) {
- int element = get_element(filename);
+ unsigned int element = get_element(filename);
// increase line execution count
++profiler_db[element].lines[get_line(element, lineno)].exec_count;
@@ -321,7 +321,7 @@ void TTCN3_Profiler::execute_line(const char* filename, int lineno)
set_prev(disable_profiler ? -1 : TTCN3_Stack_Depth::depth(), filename, lineno);
}
-int TTCN3_Profiler::get_element(const char* filename)
+unsigned int TTCN3_Profiler::get_element(const char* filename)
{
for (size_t i = 0; i < profiler_db.size(); ++i) {
if (0 == strcmp(profiler_db[i].filename, filename)) {
@@ -335,27 +335,27 @@ int TTCN3_Profiler::get_element(const char* filename)
return profiler_db.size() - 1;
}
-int TTCN3_Profiler::get_function(int element, int lineno)
+int TTCN3_Profiler::get_function(unsigned int element, int lineno)
{
return Profiler_Tools::get_function(profiler_db, element, lineno);
}
-void TTCN3_Profiler::create_function(int element, int lineno, const char* function_name)
+void TTCN3_Profiler::create_function(unsigned int element, int lineno, const char* function_name)
{
Profiler_Tools::create_function(profiler_db, element, lineno, function_name);
}
-int TTCN3_Profiler::get_line(int element, int lineno)
+int TTCN3_Profiler::get_line(unsigned int element, int lineno)
{
return Profiler_Tools::get_line(profiler_db, element, lineno);
}
-void TTCN3_Profiler::create_line(int element, int lineno)
+void TTCN3_Profiler::create_line(unsigned int element, int lineno)
{
Profiler_Tools::create_line(profiler_db, element, lineno);
}
-void TTCN3_Profiler::add_line_time(timeval elapsed, int element, int lineno)
+void TTCN3_Profiler::add_line_time(timeval elapsed, unsigned int element, int lineno)
{
if (0 == lineno) {
return;
@@ -364,7 +364,7 @@ void TTCN3_Profiler::add_line_time(timeval elapsed, int element, int lineno)
profiler_db[element].lines[get_line(element, lineno)].total_time, elapsed);
}
-void TTCN3_Profiler::add_function_time(timeval elapsed, int element, int lineno)
+void TTCN3_Profiler::add_function_time(timeval elapsed, unsigned int element, int lineno)
{
int func = get_function(element, lineno);
if (-1 == func) {
@@ -382,7 +382,7 @@ void TTCN3_Profiler::update_last()
timeval elapsed = Profiler_Tools::subtract_timeval(get_time(), prev_time);
- int element = get_element(prev_file);
+ unsigned int element = get_element(prev_file);
// add the elapsed time to the total time of the previous line
add_line_time(elapsed, element, prev_line);
diff --git a/core/Profiler.hh b/core/Profiler.hh
index ff06a272b..cc4a51e4f 100644
--- a/core/Profiler.hh
+++ b/core/Profiler.hh
@@ -82,24 +82,24 @@ public:
/** Called when a TTCN-3 code line starts execution - stores data */
void execute_line(const char* filename, int lineno);
/** Returns the index of a TTCN-3 file's entry in the local database */
- int get_element(const char* filename);
+ unsigned int get_element(const char* filename);
/** Returns the index of a TTCN-3 function's entry in the database
* @param element index of the file (where the function is declared)
* @param lineno function start line */
- int get_function(int element, int lineno);
+ int get_function(unsigned int element, int lineno);
/** Creates a new TTCN-3 function entry and inserts it in the database
* @param element file entry's index
* @param lineno function start line
* @param function_name name of the function */
- void create_function(int element, int lineno, const char* function_name);
+ void create_function(unsigned int element, int lineno, const char* function_name);
/** Returns the index of a TTCN-3 code line's entry in the database */
- int get_line(int element, int lineno);
+ int get_line(unsigned int element, int lineno);
/** Creates a new TTCN-3 code line entry and inserts it into the database */
- void create_line(int element, int lineno);
+ void create_line(unsigned int element, int lineno);
/** Adds elapsed time to the specified TTCN-3 code line's total time */
- void add_line_time(timeval elapsed, int element, int lineno);
+ void add_line_time(timeval elapsed, unsigned int element, int lineno);
/** Adds elapsed time to the specified TTCN-3 function's total time */
- void add_function_time(timeval elapsed, int element, int lineno);
+ void add_function_time(timeval elapsed, unsigned int element, int lineno);
/** Called when a TTCN-3 function's execution ends - stores data */
void update_last();
/** Stores data related to the previous location */
--
GitLab