summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorYacine Belkadi2011-01-12 17:03:54 +0100
committerYacine Belkadi2011-01-18 17:38:15 +0100
commit94588065559bf144a9e2112ec2031c40aa6c1db8 (patch)
tree0da383aa69a4c5d9daa4188a453e48ac9d604951 /cleopatre
parentd0670b66d9874d17011c625a6acc5950faf457ac (diff)
cleo/app/cwmp: replace the log_error("...") calls by the new log_mark()
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/application/cwmp/inc/utils.h9
-rw-r--r--cleopatre/application/cwmp/src/impl.c4
-rw-r--r--cleopatre/application/cwmp/src/impl_helpers.c2
-rw-r--r--cleopatre/application/cwmp/src/impl_instance.c36
-rw-r--r--cleopatre/application/cwmp/src/impl_set.c2
-rw-r--r--cleopatre/application/cwmp/src/main.c6
6 files changed, 31 insertions, 28 deletions
diff --git a/cleopatre/application/cwmp/inc/utils.h b/cleopatre/application/cwmp/inc/utils.h
index 70a851e882..8606868397 100644
--- a/cleopatre/application/cwmp/inc/utils.h
+++ b/cleopatre/application/cwmp/inc/utils.h
@@ -27,9 +27,12 @@
#define UTILS_STR(x) UTILS_STR2(x)
#define UTILS_STR2(x) #x
-#define log_debug(...) log("DEBUG", __VA_ARGS__)
-#define log_error(...) log("ERROR", __VA_ARGS__)
-#define log(level_name, ...) utils_log(level_name " [" __FILE__ ":" UTILS_STR(__LINE__) "]: " __VA_ARGS__)
+#define log_debug(...) log("DEBUG", __VA_ARGS__)
+#define log_error(...) log("ERROR", __VA_ARGS__)
+#define log(level_name, ...) utils_log(level_name " [" __FILE__ ":" UTILS_STR(__LINE__) "]: " __VA_ARGS__)
+
+/* log this point(file/line), to be able to identify the stack trace at the moment the error occured. */
+#define log_mark() log("ERROR", "...")
#define ETHERNET_INTERFACE_NAME "eth0"
#define HOMEPLUG_INTERFACE_NAME "plc0"
diff --git a/cleopatre/application/cwmp/src/impl.c b/cleopatre/application/cwmp/src/impl.c
index a6f99d1218..cce12013bd 100644
--- a/cleopatre/application/cwmp/src/impl.c
+++ b/cleopatre/application/cwmp/src/impl.c
@@ -36,7 +36,7 @@ impl_init(impl_get_instance_number_fct fct)
if (status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -51,7 +51,7 @@ impl_before_session(void)
status = cache_network_interfaces_stats();
if (status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
diff --git a/cleopatre/application/cwmp/src/impl_helpers.c b/cleopatre/application/cwmp/src/impl_helpers.c
index 556b192b16..8019743664 100644
--- a/cleopatre/application/cwmp/src/impl_helpers.c
+++ b/cleopatre/application/cwmp/src/impl_helpers.c
@@ -239,7 +239,7 @@ read_key_values(const char *key, unsigned int values[], unsigned int nb_values)
{
if(str_to_uint(str_values[i], &values[i]) != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return IMPL_STATUS_ERROR;
}
}
diff --git a/cleopatre/application/cwmp/src/impl_instance.c b/cleopatre/application/cwmp/src/impl_instance.c
index c18f8fd6bc..94476d7b89 100644
--- a/cleopatre/application/cwmp/src/impl_instance.c
+++ b/cleopatre/application/cwmp/src/impl_instance.c
@@ -64,7 +64,7 @@ get_prev_next_instance_number(const char *object_name, unsigned int instance_num
}
else
{
- log_error("...");
+ log_mark();
}
return status;
@@ -93,7 +93,7 @@ get_first_last_new_instance_number(const char *object_name, unsigned int *first_
}
else
{
- log_error("...");
+ log_mark();
}
return status;
@@ -171,7 +171,7 @@ get_next_instance_number(const char *object_name, unsigned int index, unsigned i
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -189,7 +189,7 @@ get_next_instance_number(const char *object_name, unsigned int index, unsigned i
impl_status_t status = get_prev_next_instance_number(object_name, instance_number, &dummy, &instance_number);
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -234,7 +234,7 @@ write_instance_default_params_device_dns_client_server(unsigned int instance_num
status = fwrite_str_param(param_name, CWMP_PARAM_SIZE_DEVICE_DNS_CLIENT_SERVER_i_ALIAS, "");
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -242,7 +242,7 @@ write_instance_default_params_device_dns_client_server(unsigned int instance_num
status = fwrite_str_param(param_name, CWMP_PARAM_SIZE_DEVICE_DNS_CLIENT_SERVER_i_DNSSERVER, "");
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -251,7 +251,7 @@ write_instance_default_params_device_dns_client_server(unsigned int instance_num
status = fwrite_bool_param(param_name, "false");
if (status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -259,7 +259,7 @@ write_instance_default_params_device_dns_client_server(unsigned int instance_num
status = fwrite_str_param(param_name, CWMP_PARAM_SIZE_DEVICE_DNS_CLIENT_SERVER_i_INTERFACE, "");
if (status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -267,7 +267,7 @@ write_instance_default_params_device_dns_client_server(unsigned int instance_num
status = fwrite_str_param(param_name, CWMP_PARAM_SIZE_DEVICE_DNS_CLIENT_SERVER_i_STATUS, "Disabled");
if (status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -275,7 +275,7 @@ write_instance_default_params_device_dns_client_server(unsigned int instance_num
status = fwrite_str_param(param_name, CWMP_PARAM_SIZE_DEVICE_DNS_CLIENT_SERVER_i_TYPE, "Static");
if (status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -296,7 +296,7 @@ add_instance(const char *object_name,
status = get_first_last_new_instance_number(object_name, &first_instance_number, &last_instance_number, &new_instance_number);
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -310,14 +310,14 @@ add_instance(const char *object_name,
status = get_prev_next_instance_number(object_name, last_instance_number, &prev, &next);
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
status = set_prev_next_instance_number(object_name, last_instance_number, prev, new_instance_number);
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
}
@@ -326,14 +326,14 @@ add_instance(const char *object_name,
status = set_prev_next_instance_number(object_name, new_instance_number, last_instance_number, NULL_INSTANCE_NUMBER);
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
status = write_instance_default_params(new_instance_number);
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -345,7 +345,7 @@ add_instance(const char *object_name,
get_next_new_instance_number(object_name, new_instance_number));
if (status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return status;
}
@@ -401,7 +401,7 @@ impl_instance_exists(impl_param_id_t object_id, const char *instance_name, bool
if (status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
}
return status;
@@ -436,7 +436,7 @@ impl_get_next_instance_number(impl_param_id_t object_id, const char *object_name
if(status != IMPL_STATUS_OK)
{
- log_error("...");
+ log_mark();
return 0;
}
diff --git a/cleopatre/application/cwmp/src/impl_set.c b/cleopatre/application/cwmp/src/impl_set.c
index 2e413f3470..edfb408546 100644
--- a/cleopatre/application/cwmp/src/impl_set.c
+++ b/cleopatre/application/cwmp/src/impl_set.c
@@ -83,7 +83,7 @@ complete_set_device_homeplug_interface_i_networkpassword(struct pending_device_h
int exit_status;
if (utils_run_command(argv[0], argv, &exit_status) != UTILS_STATUS_OK)
{
- log_error("...");
+ log_mark();
return IMPL_STATUS_ERROR;
}
diff --git a/cleopatre/application/cwmp/src/main.c b/cleopatre/application/cwmp/src/main.c
index b07add5a50..1c298a0dd0 100644
--- a/cleopatre/application/cwmp/src/main.c
+++ b/cleopatre/application/cwmp/src/main.c
@@ -256,7 +256,7 @@ instance_exists(struct cwmp *cwmp, paramid_t object_id, const char *instance_nam
}
else
{
- log_error("...");
+ log_mark();
return 0;
}
}
@@ -275,7 +275,7 @@ get_next_instance_number(struct cwmp *cwmp, paramid_t object_id, const char *obj
}
else
{
- log_error("...");
+ log_mark();
return 0;
}
}
@@ -294,7 +294,7 @@ add_instance(struct cwmp *cwmp, paramid_t object_id, const char *object_name)
}
else
{
- log_error("...");
+ log_mark();
return 0;
}
}