From fcab80bfee34e5029b1c5d21faaf9311452f598f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Wed, 8 Jun 2016 13:04:54 +0200
Subject: [PATCH] getprogname: rename to px4_get_taskname
---
src/modules/systemlib/err.c | 4 ++--
src/platforms/nuttx/px4_layer/px4_nuttx_tasks.c | 2 +-
src/platforms/posix/px4_layer/px4_posix_tasks.cpp | 2 +-
src/platforms/px4_tasks.h | 3 ++-
src/platforms/qurt/px4_layer/px4_qurt_tasks.cpp | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/modules/systemlib/err.c b/src/modules/systemlib/err.c
index 5ad31330af..78e3058068 100644
--- a/src/modules/systemlib/err.c
+++ b/src/modules/systemlib/err.c
@@ -67,7 +67,7 @@ static void
warnerr_core(int errcode, const char *fmt, va_list args)
{
#if CONFIG_NFILE_STREAMS > 0
- fprintf(stderr, "%s: ", getprogname());
+ fprintf(stderr, "%s: ", px4_get_taskname());
vfprintf(stderr, fmt, args);
/* convenience as many parts of NuttX use negative errno */
@@ -81,7 +81,7 @@ warnerr_core(int errcode, const char *fmt, va_list args)
fprintf(stderr, "\n");
#elif CONFIG_ARCH_LOWPUTC
- lowsyslog("%s: ", getprogname());
+ lowsyslog("%s: ", px4_get_taskname());
lowvsyslog(fmt, args);
/* convenience as many parts of NuttX use negative errno */
diff --git a/src/platforms/nuttx/px4_layer/px4_nuttx_tasks.c b/src/platforms/nuttx/px4_layer/px4_nuttx_tasks.c
index 4cefa0c716..84eed74b53 100644
--- a/src/platforms/nuttx/px4_layer/px4_nuttx_tasks.c
+++ b/src/platforms/nuttx/px4_layer/px4_nuttx_tasks.c
@@ -108,7 +108,7 @@ int px4_task_delete(int pid)
return task_delete(pid);
}
-const char *getprogname(void)
+const char *px4_get_taskname(void)
{
#if CONFIG_TASK_NAME_SIZE > 0
FAR struct tcb_s *thisproc = sched_self();
diff --git a/src/platforms/posix/px4_layer/px4_posix_tasks.cpp b/src/platforms/posix/px4_layer/px4_posix_tasks.cpp
index ffcd74f5e1..53cc821b2f 100644
--- a/src/platforms/posix/px4_layer/px4_posix_tasks.cpp
+++ b/src/platforms/posix/px4_layer/px4_posix_tasks.cpp
@@ -388,7 +388,7 @@ unsigned long px4_getpid()
return (unsigned long)pthread_self();
}
-const char *getprogname()
+const char *px4_get_taskname()
{
pthread_t pid = pthread_self();
const char *prog_name = "UnknownApp";
diff --git a/src/platforms/px4_tasks.h b/src/platforms/px4_tasks.h
index 0ce9e2e4a3..6fa3619ae5 100644
--- a/src/platforms/px4_tasks.h
+++ b/src/platforms/px4_tasks.h
@@ -134,7 +134,8 @@ __EXPORT bool px4_task_is_running(const char *taskname);
__EXPORT int px4_prctl(int option, const char *arg2, unsigned pid);
#endif
-__EXPORT const char *getprogname(void);
+/** return the name of the current task */
+__EXPORT const char *px4_get_taskname(void);
__END_DECLS
diff --git a/src/platforms/qurt/px4_layer/px4_qurt_tasks.cpp b/src/platforms/qurt/px4_layer/px4_qurt_tasks.cpp
index 40897c8ff0..6cf342076a 100644
--- a/src/platforms/qurt/px4_layer/px4_qurt_tasks.cpp
+++ b/src/platforms/qurt/px4_layer/px4_qurt_tasks.cpp
@@ -348,7 +348,7 @@ unsigned long px4_getpid()
}
-const char *getprogname()
+const char *px4_get_taskname()
{
pthread_t pid = pthread_self();
--
GitLab