!157 删除无用的__cplusplus,移除不必要的文件x权限

Merge pull request !157 from Caoruihong/cplusplus
This commit is contained in:
openharmony_ci 2021-04-20 09:01:45 +08:00 committed by Gitee
commit 7ba0bfa800
374 changed files with 0 additions and 1065 deletions

0
BUILD.gn Executable file → Normal file
View File

0
Kconfig Executable file → Normal file
View File

0
apps/Makefile Executable file → Normal file
View File

0
apps/config.mk Executable file → Normal file
View File

0
apps/init/Makefile Executable file → Normal file
View File

0
apps/init/src/init.c Executable file → Normal file
View File

0
apps/module.mk Executable file → Normal file
View File

0
apps/shell/Makefile Executable file → Normal file
View File

10
apps/shell/builtin/cd.c Executable file → Normal file
View File

@ -37,11 +37,6 @@
#include "shcmd.h"
#include "sherr.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
int Chdir(const char *tgtDir)
{
@ -59,8 +54,3 @@ int Chdir(const char *tgtDir)
return ret;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif

0
apps/shell/include/shcmd.h Executable file → Normal file
View File

0
apps/shell/include/shell.h Executable file → Normal file
View File

0
apps/shell/include/shmsg.h Executable file → Normal file
View File

0
apps/shell/include/show.h Executable file → Normal file
View File

10
apps/shell/src/main.c Executable file → Normal file
View File

@ -36,11 +36,6 @@
#include "securec.h"
#include "unistd.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
ShellCB *g_shellCB = NULL;
@ -139,8 +134,3 @@ ERR_OUT1:
return ret;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif

10
apps/shell/src/shcmd.c Executable file → Normal file
View File

@ -36,11 +36,6 @@
#include "dirent.h"
#include "securec.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define SHELL_INIT_MAGIC_FLAG 0xABABABAB
#define CTRL_C 0x03 /* 0x03: ctrl+c ASCII */
@ -599,8 +594,3 @@ unsigned int OsCmdExec(CmdParsed *cmdParsed, char *cmdStr)
return ret;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif

10
apps/shell/src/shcmdparse.c Executable file → Normal file
View File

@ -32,11 +32,6 @@
#include "shcmd.h"
#include "sherr.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*
* Filter out double quote or single-quoted strings at both ends
@ -157,8 +152,3 @@ unsigned int OsCmdParse(char *cmdStr, CmdParsed *cmdParsed)
return OsCmdTokenSplit(cmdStr, ' ', cmdParsed);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif

10
apps/shell/src/shmsg.c Executable file → Normal file
View File

@ -42,11 +42,6 @@
#include "shell_pri.h"
#include "shcmd.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
char *GetCmdline(ShellCB *shellCB)
@ -640,8 +635,3 @@ int ShellEntryInit(ShellCB *shellCB)
return ret;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif
#endif

0
arch/Kconfig Executable file → Normal file
View File

0
arch/arm/arm/Makefile Executable file → Normal file
View File

0
arch/arm/arm/include/arm.h Executable file → Normal file
View File

0
arch/arm/arm/include/arm_user_copy.h Executable file → Normal file
View File

0
arch/arm/arm/include/arm_user_get.h Executable file → Normal file
View File

0
arch/arm/arm/include/arm_user_put.h Executable file → Normal file
View File

0
arch/arm/arm/include/los_hw_cpu.h Executable file → Normal file
View File

0
arch/arm/arm/include/los_mmu_descriptor_v6.h Executable file → Normal file
View File

0
arch/arm/arm/src/hw_user_get.S Executable file → Normal file
View File

0
arch/arm/arm/src/hw_user_put.S Executable file → Normal file
View File

0
arch/arm/arm/src/include/asm.h Executable file → Normal file
View File

0
arch/arm/arm/src/include/los_hw_pri.h Executable file → Normal file
View File

10
arch/arm/arm/src/los_arch_mmu.c Executable file → Normal file
View File

@ -45,11 +45,6 @@
#include "los_vm_boot.h"
#include "los_mmu_descriptor_v6.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#ifdef LOSCFG_KERNEL_MMU
@ -973,9 +968,4 @@ VOID OsInitMappingStartUp(VOID)
}
#endif
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -39,11 +39,6 @@
#include "los_spinlock.h"
#include "los_mmu_descriptor_v6.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#ifdef LOSCFG_KERNEL_VM
@ -76,8 +71,3 @@ VOID OsFreeAsid(UINT32 asid)
}
#endif
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
arch/arm/arm/src/los_dispatch.S Executable file → Normal file
View File

10
arch/arm/arm/src/los_exc.c Executable file → Normal file
View File

@ -66,11 +66,6 @@
#include "console.h"
#endif
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define INVALID_CPUID 0xFFFF
#define OS_EXC_VMM_NO_REGION 0x0U
@ -1191,8 +1186,3 @@ VOID LOS_RecordLR(UINTPTR *LR, UINT32 LRSize, UINT32 recordCount, UINT32 jumpCou
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
arch/arm/arm/src/los_hw.c Executable file → Normal file
View File

@ -32,11 +32,6 @@
#include "los_hw_pri.h"
#include "los_task_pri.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* support cpu vendors */
CpuVendor g_cpuTable[] = {
@ -177,8 +172,3 @@ VOID DCacheInvRange(UINT32 start, UINT32 end)
arm_inv_cache_range(start, end);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
arch/arm/arm/src/los_hw_exc.S Executable file → Normal file
View File

View File

@ -32,11 +32,6 @@
#include "los_sys_pri.h"
#include "los_hwi.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
LITE_OS_SEC_TEXT_INIT UINT32 OsTickInit(UINT32 systemClock, UINT32 tickPerSecond)
{
@ -79,8 +74,3 @@ LITE_OS_SEC_TEXT_MINOR VOID LOS_Mdelay(UINT32 msecs)
HalDelayUs(msecs * 1000); /* 1000 : 1ms = 1000us */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -37,11 +37,6 @@
#endif
#include "los_sched_pri.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* spinlock for hwi module, only available on SMP mode */
LITE_OS_SEC_BSS SPIN_LOCK_INIT(g_hwiSpin);
@ -352,8 +347,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_HwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irq
return ret;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
arch/arm/arm/src/startup/reset_vector_mp.S Executable file → Normal file
View File

0
arch/arm/arm/src/startup/reset_vector_up.S Executable file → Normal file
View File

10
arch/arm/arm/src/strncpy_from_user.c Executable file → Normal file
View File

@ -33,11 +33,6 @@
#include "los_user_get.h"
#include "los_vm_map.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
INT32 LOS_StrncpyFromUser(CHAR *dst, const CHAR *src, INT32 count)
{
@ -67,8 +62,3 @@ INT32 LOS_StrncpyFromUser(CHAR *dst, const CHAR *src, INT32 count)
return offset;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
arch/arm/arm/src/strnlen_user.c Executable file → Normal file
View File

@ -33,11 +33,6 @@
#include "los_user_get.h"
#include "los_vm_map.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
INT32 LOS_StrnlenUser(const CHAR *src, INT32 count)
{
@ -66,8 +61,3 @@ INT32 LOS_StrnlenUser(const CHAR *src, INT32 count)
return count + 1;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
arch/arm/arm/src/user_copy.c Executable file → Normal file
View File

@ -35,11 +35,6 @@
#include "los_memory.h"
#include "los_vm_map.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
size_t arch_copy_from_user(void *dst, const void *src, size_t len)
{
@ -114,9 +109,4 @@ INT32 LOS_UserMemClear(unsigned char *buf, UINT32 len)
return ret;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
arch/arm/gic/Makefile Executable file → Normal file
View File

0
arch/arm/include/in_cksum.h Executable file → Normal file
View File

0
arch/arm/include/los_exc.h Executable file → Normal file
View File

0
arch/arm/include/los_hw.h Executable file → Normal file
View File

0
arch/arm/include/los_hwi.h Executable file → Normal file
View File

0
arch/arm/include/los_strncpy_from_user.h Executable file → Normal file
View File

0
arch/arm/include/los_strnlen_user.h Executable file → Normal file
View File

0
arch/arm/include/los_user_get.h Executable file → Normal file
View File

0
arch/arm/include/los_user_put.h Executable file → Normal file
View File

0
arch/arm/include/user_copy.h Executable file → Normal file
View File

0
bsd/Kconfig Executable file → Normal file
View File

0
bsd/compat/linuxkpi/Makefile Executable file → Normal file
View File

0
bsd/dev/usb/Kconfig Executable file → Normal file
View File

0
bsd/dev/usb/Makefile Executable file → Normal file
View File

0
compat/posix/Kconfig Executable file → Normal file
View File

0
compat/posix/include/mqueue.h Executable file → Normal file
View File

0
compat/posix/include/time_posix.h Executable file → Normal file
View File

View File

@ -34,11 +34,6 @@
#include "los_sem.h"
#include "los_task.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
int map_errno(UINT32 err)
{
@ -115,8 +110,3 @@ int map_errno(UINT32 err)
return errno;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
compat/posix/src/misc.c Executable file → Normal file
View File

@ -37,11 +37,6 @@
#include "mqueue.h"
#include "semaphore.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*
* Supply some suitable values for constants that may not be present
@ -145,8 +140,3 @@ pid_t getpid(void)
return ((LosTaskCB *)(OsCurrTaskGet()))->taskID;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
compat/posix/src/mqueue.c Executable file → Normal file
View File

@ -40,11 +40,6 @@
#include "fs_file.h"
#include "user_copy.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define FNONBLOCK O_NONBLOCK
@ -842,8 +837,3 @@ ssize_t mq_receive(mqd_t personal, char *msg_ptr, size_t msg_len, unsigned int *
return mq_timedreceive(personal, msg_ptr, msg_len, msg_prio, NULL);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -32,11 +32,6 @@
#include "los_typedef.h"
#include "los_memory.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
int posix_memalign(void **memAddr, size_t alignment, size_t size)
{
@ -52,8 +47,3 @@ int posix_memalign(void **memAddr, size_t alignment, size_t size)
return ENOERR;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
compat/posix/src/pthread.c Executable file → Normal file
View File

@ -38,11 +38,6 @@
#include "los_process_pri.h"
#include "los_sched_pri.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*
* Array of pthread control structures. A pthread_t object is
@ -809,8 +804,3 @@ int pthread_getaffinity_np(pthread_t thread, size_t cpusetsize, cpu_set_t* cpuse
}
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -32,11 +32,6 @@
#include "pthread.h"
#include "pprivate.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
int pthread_attr_init(pthread_attr_t *attr)
{
@ -280,8 +275,3 @@ int pthread_attr_getaffinity_np(const pthread_attr_t* attr, size_t cpusetsize, c
return ENOERR;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
compat/posix/src/pthread_cond.c Executable file → Normal file
View File

@ -36,11 +36,6 @@
#include "los_atomic.h"
#include "los_event_pri.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define BROADCAST_EVENT 1
#define COND_COUNTER_STEP 0x0004U
@ -351,8 +346,3 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
return ret;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
compat/posix/src/pthread_mutex.c Executable file → Normal file
View File

@ -31,11 +31,6 @@
#include "pthread.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
int pthread_mutexattr_init(pthread_mutexattr_t *attr)
{
@ -139,8 +134,3 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex)
return LOS_MuxUnlock(mutex);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -35,11 +35,6 @@
#include "unistd.h"
#include "los_task_pri.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
int sched_get_priority_min(int policy)
{
@ -143,8 +138,3 @@ int __sched_cpucount(size_t set_size, const cpu_set_t* set)
return count;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
compat/posix/src/semaphore.c Executable file → Normal file
View File

@ -34,11 +34,6 @@
#include "map_error.h"
#include "time_posix.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/* Initialize semaphore to value, shared is not supported in Huawei LiteOS. */
int sem_init(sem_t *sem, int shared, unsigned int value)
@ -197,8 +192,3 @@ int sem_unlink(const char *name)
return -1;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

10
compat/posix/src/time.c Executable file → Normal file
View File

@ -50,11 +50,6 @@
#include "los_swtmr_pri.h"
#include "los_sys_pri.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
/*
* Do a time package defined return. This requires the error code
@ -991,8 +986,3 @@ VOID OsGetVdsoTime(VdsoDataPage *vdsoDataPage)
}
#endif
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
config.mk Executable file → Normal file
View File

View File

@ -32,11 +32,6 @@
#include "fcntl.h"
#include "linux/kernel.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
static int MemOpen(struct file *filep)
{
@ -105,8 +100,3 @@ int DevMemRegister(void)
return register_driver("/dev/mem", &g_memDevOps, 0666, 0); /* 0666: file mode */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -39,11 +39,6 @@
#define QUICKSTART_UNREGISTER _IO(QUICKSTART_IOC_MAGIC, 1)
#define QUICKSTART_NODE "/dev/quickstart"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
static int QuickstartOpen(struct file *filep)
{
@ -110,8 +105,3 @@ int DevQuickStartRegister(void)
return register_driver(QUICKSTART_NODE, &g_quickstartDevOps, 0666, 0); /* 0666: file mode */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -33,11 +33,6 @@
#include "fcntl.h"
#include "linux/kernel.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
static unsigned long g_randomMax = 0x7FFFFFFF;
@ -121,8 +116,3 @@ int DevRandomRegister(void)
return register_driver("/dev/random", &g_ranDevOps, 0666, 0); /* 0666: file mode */
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -120,8 +120,3 @@ int DevUrandomRegister(void)
return -EPERM;
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

0
fs/fat/Kconfig Executable file → Normal file
View File

0
fs/fat/Makefile Executable file → Normal file
View File

0
fs/fat/os_adapt/fat_shellcmd.c Executable file → Normal file
View File

10
fs/fat/os_adapt/fatfs.c Executable file → Normal file
View File

@ -56,11 +56,6 @@
#include <sys/stat.h>
#include <sys/types.h>
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
struct VnodeOps fatfs_vops; /* forward define */
struct file_operations_vfs fatfs_fops;
@ -2082,9 +2077,4 @@ struct file_operations_vfs fatfs_fops = {
FSMAP_ENTRY(fat_fsmap, "vfat", fatfs_mops, FALSE, TRUE);
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */
#endif /* LOSCFG_FS_FAT */

0
fs/fat/os_adapt/fatfs.h Executable file → Normal file
View File

0
fs/fat/os_adapt/format.c Executable file → Normal file
View File

0
fs/fat/virpart/Makefile Executable file → Normal file
View File

0
fs/fat/virpart/src/virpart.c Executable file → Normal file
View File

0
fs/fat/virpart/src/virpartff.c Executable file → Normal file
View File

0
fs/include/vfs_config.h Executable file → Normal file
View File

0
fs/jffs2/Kconfig Executable file → Normal file
View File

0
fs/jffs2/include/jffs2_hash.h Executable file → Normal file
View File

0
fs/jffs2/src/jffs2_hash.c Executable file → Normal file
View File

0
fs/jffs2/src/vfs_jffs2.c Executable file → Normal file
View File

0
fs/proc/BUILD.gn Executable file → Normal file
View File

0
fs/proc/include/internal.h Executable file → Normal file
View File

0
fs/proc/include/proc_file.h Executable file → Normal file
View File

0
fs/proc/include/proc_fs.h Executable file → Normal file
View File

0
fs/proc/os_adapt/kernel_trace_proc.c Executable file → Normal file
View File

0
fs/proc/os_adapt/mounts_proc.c Executable file → Normal file
View File

0
fs/proc/os_adapt/proc_init.c Executable file → Normal file
View File

0
fs/proc/os_adapt/proc_vfs.c Executable file → Normal file
View File

0
fs/proc/os_adapt/process_proc.c Executable file → Normal file
View File

0
fs/proc/os_adapt/uptime_proc.c Executable file → Normal file
View File

0
fs/proc/os_adapt/vmm_proc.c Executable file → Normal file
View File

Some files were not shown because too many files have changed in this diff Show More