summaryrefslogtreecommitdiff
path: root/components/libc/libdl
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2021-05-28 16:20:08 +0800
committerGitHub <[email protected]>2021-05-28 16:20:08 +0800
commit92beddf3bccf6346e26aa097f82464456fb8e6bd (patch)
tree197e4a108118dda016ea02274172f0c40e7ee8ed /components/libc/libdl
parentb18a99b44240ec3152011e159cc24a5af8dff0ce (diff)
parent03f4d40e30f3c94e1db0b3a65b3610dee695694a (diff)
Merge pull request #4737 from mysterywolf/3,1,xformatv3.1.5
[lts 3.1.x] format codes
Diffstat (limited to 'components/libc/libdl')
-rw-r--r--components/libc/libdl/arch/arm.c4
-rw-r--r--components/libc/libdl/arch/x86.c10
-rw-r--r--components/libc/libdl/dlclose.c2
-rw-r--r--components/libc/libdl/dlelf.c10
-rw-r--r--components/libc/libdl/dlelf.h4
-rw-r--r--components/libc/libdl/dlerror.c6
-rw-r--r--components/libc/libdl/dlfcn.h4
-rw-r--r--components/libc/libdl/dlmodule.c6
-rw-r--r--components/libc/libdl/dlmodule.h2
-rw-r--r--components/libc/libdl/dlopen.c6
-rw-r--r--components/libc/libdl/dlsym.c4
11 files changed, 29 insertions, 29 deletions
diff --git a/components/libc/libdl/arch/arm.c b/components/libc/libdl/arch/arm.c
index a53c04f0bc..6a884bdb54 100644
--- a/components/libc/libdl/arch/arm.c
+++ b/components/libc/libdl/arch/arm.c
@@ -1,8 +1,8 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
- *
+ *
* Change Logs:
* Date Author Notes
* 2018/08/29 Bernard first version
diff --git a/components/libc/libdl/arch/x86.c b/components/libc/libdl/arch/x86.c
index 16f2322fb4..e7ad714a03 100644
--- a/components/libc/libdl/arch/x86.c
+++ b/components/libc/libdl/arch/x86.c
@@ -1,8 +1,8 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
- *
+ *
* Change Logs:
* Date Author Notes
* 2018/09/15 parai first version
@@ -13,9 +13,9 @@
#ifdef __i386__
-#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
-#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
-#define R_X86_64_RELATIVE 8 /* Adjust by program base */
+#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
+#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
+#define R_X86_64_RELATIVE 8 /* Adjust by program base */
int dlmodule_relocate(struct rt_dlmodule *module, Elf32_Rel *rel, Elf32_Addr sym_val)
{
Elf32_Addr *where, tmp;
diff --git a/components/libc/libdl/dlclose.c b/components/libc/libdl/dlclose.c
index 1202e13f2c..876a1576c8 100644
--- a/components/libc/libdl/dlclose.c
+++ b/components/libc/libdl/dlclose.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/libc/libdl/dlelf.c b/components/libc/libdl/dlelf.c
index 1265ffcb07..3a4e62ad9b 100644
--- a/components/libc/libdl/dlelf.c
+++ b/components/libc/libdl/dlelf.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -172,7 +172,7 @@ rt_err_t dlmodule_load_shared_object(struct rt_dlmodule* module, void *module_pt
rel ++;
}
- if (unsolved)
+ if (unsolved)
return -RT_ERROR;
}
@@ -301,7 +301,7 @@ rt_err_t dlmodule_load_relocated_object(struct rt_dlmodule* module, void *module
(rt_uint8_t *)elf_module + shdr[index].sh_offset,
shdr[index].sh_size);
rodata_addr = (rt_uint32_t)ptr;
- LOG_D("load rodata 0x%x, size %d, rodata 0x%x", ptr,
+ LOG_D("load rodata 0x%x, size %d, rodata 0x%x", ptr,
shdr[index].sh_size, *(rt_uint32_t *)data_addr);
ptr += shdr[index].sh_size;
}
@@ -313,7 +313,7 @@ rt_err_t dlmodule_load_relocated_object(struct rt_dlmodule* module, void *module
(rt_uint8_t *)elf_module + shdr[index].sh_offset,
shdr[index].sh_size);
data_addr = (rt_uint32_t)ptr;
- LOG_D("load data 0x%x, size %d, data 0x%x", ptr,
+ LOG_D("load data 0x%x, size %d, data 0x%x", ptr,
shdr[index].sh_size, *(rt_uint32_t *)data_addr);
ptr += shdr[index].sh_size;
}
@@ -362,7 +362,7 @@ rt_err_t dlmodule_load_relocated_object(struct rt_dlmodule* module, void *module
if (sym->st_shndx != STN_UNDEF)
{
Elf32_Addr addr = 0;
-
+
if ((ELF_ST_TYPE(sym->st_info) == STT_SECTION) ||
(ELF_ST_TYPE(sym->st_info) == STT_OBJECT))
{
diff --git a/components/libc/libdl/dlelf.h b/components/libc/libdl/dlelf.h
index 014ebe85c8..ad9e2cdade 100644
--- a/components/libc/libdl/dlelf.h
+++ b/components/libc/libdl/dlelf.h
@@ -1,8 +1,8 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
- *
+ *
* Change Logs:
* Date Author Notes
* 2018/08/29 Bernard first version
diff --git a/components/libc/libdl/dlerror.c b/components/libc/libdl/dlerror.c
index ad9b630e4c..de948eb16b 100644
--- a/components/libc/libdl/dlerror.c
+++ b/components/libc/libdl/dlerror.c
@@ -1,8 +1,8 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
- *
+ *
* Change Logs:
* Date Author Notes
* 2010-11-17 yi.qiu first version
@@ -13,6 +13,6 @@
const char *dlerror(void)
{
- return "TODO";
+ return "TODO";
}
RTM_EXPORT(dlerror)
diff --git a/components/libc/libdl/dlfcn.h b/components/libc/libdl/dlfcn.h
index 55273a41eb..f5c9063f2f 100644
--- a/components/libc/libdl/dlfcn.h
+++ b/components/libc/libdl/dlfcn.h
@@ -1,8 +1,8 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
- *
+ *
* Change Logs:
* Date Author Notes
* 2010-11-17 yi.qiu first version
diff --git a/components/libc/libdl/dlmodule.c b/components/libc/libdl/dlmodule.c
index 21e070a106..5387bc4c0f 100644
--- a/components/libc/libdl/dlmodule.c
+++ b/components/libc/libdl/dlmodule.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -547,7 +547,7 @@ struct rt_dlmodule* dlmodule_exec(const char* pgname, const char* cmd, int cmd_s
if (module->priority > RT_THREAD_PRIORITY_MAX) module->priority = RT_THREAD_PRIORITY_MAX - 1;
if (module->stack_size < 2048 || module->stack_size > (1024 * 32)) module->stack_size = 2048;
- tid = rt_thread_create(module->parent.name, _dlmodule_thread_entry, (void*)module,
+ tid = rt_thread_create(module->parent.name, _dlmodule_thread_entry, (void*)module,
module->stack_size, module->priority, 10);
if (tid)
{
@@ -580,7 +580,7 @@ void dlmodule_exit(int ret_code)
rt_enter_critical();
/* module is not running */
- if (module->stat != RT_DLMODULE_STAT_RUNNING)
+ if (module->stat != RT_DLMODULE_STAT_RUNNING)
{
/* restore scheduling */
rt_exit_critical();
diff --git a/components/libc/libdl/dlmodule.h b/components/libc/libdl/dlmodule.h
index 4a4ead3303..688c0d4dfa 100644
--- a/components/libc/libdl/dlmodule.h
+++ b/components/libc/libdl/dlmodule.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/libc/libdl/dlopen.c b/components/libc/libdl/dlopen.c
index a8202ec607..bcb57d78f0 100644
--- a/components/libc/libdl/dlopen.c
+++ b/components/libc/libdl/dlopen.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -43,12 +43,12 @@ void* dlopen(const char *filename, int flags)
/* find in module list */
module = dlmodule_find(fullpath);
- if(module != RT_NULL)
+ if(module != RT_NULL)
{
rt_exit_critical();
module->nref++;
}
- else
+ else
{
rt_exit_critical();
module = dlmodule_load(fullpath);
diff --git a/components/libc/libdl/dlsym.c b/components/libc/libdl/dlsym.c
index ed0f183d83..f7c1c901fd 100644
--- a/components/libc/libdl/dlsym.c
+++ b/components/libc/libdl/dlsym.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -17,7 +17,7 @@ void* dlsym(void *handle, const char* symbol)
{
int i;
struct rt_dlmodule *module;
-
+
RT_ASSERT(handle != RT_NULL);
module = (struct rt_dlmodule *)handle;