LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 1ef2354f: Merge "[MIPS] Expand TABS and remove redundant return parenthesis."

Browse Source 
* commit '1ef2354fa780df42c8d42af4300f63d81ae7b52d':
  [MIPS] Expand TABS and remove redundant return parenthesis.
This commit is contained in:
Andrew Hsieh
2013-02-21 14:20:57 -08:00
committed by Android Git Automerger
parent 330baa51a8 1ef2354fa7
commit 364e4d94da
7 changed files with 80 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/sources/android/libportable/arch-mips/clone.c
View File

@@ -92,5 +92,5 @@ int clone_portable(int (*fn)(void *), void *child_stack, int port_flags, void *a
new_tls, child_tidptr);
ALOGV("%s: return(ret:%d); }", __func__, ret);
return(ret);
return ret;
}

10
ndk/sources/android/libportable/arch-mips/fcntl.c
View File

@@ -58,7 +58,7 @@ static char *map_portable_cmd_to_name(int cmd)
case F_DUPFD_CLOEXEC_PORTABLE: name = "F_DUPFD_CLOEXEC_PORTABLE"; break; /* 1030 */
default: name = "<UNKNOWN>"; break;
}
return(name);
return name;
}
static int mips_change_cmd(int cmd)
@@ -102,15 +102,15 @@ static int mips_change_cmd(int cmd)
return F_NOTIFY;
case F_CANCELLK_PORTABLE: /* 1029 --> void */
ALOGE("%s: case F_CANCELLK_PORTABLE: Not likely supported by MIPS.", __func__);
return(cmd);
return cmd;
case F_DUPFD_CLOEXEC_PORTABLE: /* 1030 --> VOID */
ALOGE("%s: case F_DUPFD_CLOEXEC_PORTABLE: Not likely supported by MIPS.", __func__);
return(cmd);
return cmd;
default:
ALOGE("%s: cmd:%d Not Supported", __func__, cmd);
/* Fall thru and default to the command being the same */
}
return(cmd);
return cmd;
}
static int mips_change_flags(int flags)
@@ -341,6 +341,6 @@ int fcntl_portable(int fd, int portable_cmd, ...)
done:
ALOGV("%s: return(result:%d); }", __func__, result);
return(result);
return result;
}

28
ndk/sources/android/libportable/arch-mips/open.c
View File

@@ -28,33 +28,33 @@ static inline int mips_change_flags(int flags)
{
int mipsflags = flags & O_ACCMODE_PORTABLE;
if (flags & O_CREAT_PORTABLE)
mipsflags |= O_CREAT;
mipsflags |= O_CREAT;
if (flags & O_EXCL_PORTABLE)
mipsflags |= O_EXCL;
mipsflags |= O_EXCL;
if (flags & O_NOCTTY_PORTABLE)
mipsflags |= O_NOCTTY;
mipsflags |= O_NOCTTY;
if (flags & O_TRUNC_PORTABLE)
mipsflags |= O_TRUNC;
mipsflags |= O_TRUNC;
if (flags & O_APPEND_PORTABLE)
mipsflags |= O_APPEND;
mipsflags |= O_APPEND;
if (flags & O_NONBLOCK_PORTABLE)
mipsflags |= O_NONBLOCK;
mipsflags |= O_NONBLOCK;
if (flags & O_SYNC_PORTABLE)
mipsflags |= O_SYNC;
mipsflags |= O_SYNC;
if (flags & FASYNC_PORTABLE)
mipsflags |= FASYNC;
mipsflags |= FASYNC;
if (flags & O_DIRECT_PORTABLE)
mipsflags |= O_DIRECT;
mipsflags |= O_DIRECT;
if (flags & O_LARGEFILE_PORTABLE)
mipsflags |= O_LARGEFILE;
mipsflags |= O_LARGEFILE;
if (flags & O_DIRECTORY_PORTABLE)
mipsflags |= O_DIRECTORY;
mipsflags |= O_DIRECTORY;
if (flags & O_NOFOLLOW_PORTABLE)
mipsflags |= O_NOFOLLOW;
mipsflags |= O_NOFOLLOW;
if (flags & O_NOATIME_PORTABLE)
mipsflags |= O_NOATIME;
mipsflags |= O_NOATIME;
if (flags & O_NDELAY_PORTABLE)
mipsflags |= O_NDELAY;
mipsflags |= O_NDELAY;
return mipsflags;
}

38
ndk/sources/android/libportable/arch-mips/signal.c
View File

@@ -173,7 +173,7 @@ __hidden int map_portable_signum_to_mips(int portable_signum)
case SIGSTKFLT_PORTABLE: /* 16 --> VOID:0 */
/* No MIPS SIGSTKFLT Exits; try mapping it to zero */
return(0);
return 0;
case SIGCHLD_PORTABLE: /* 17 --> 18 */
return SIGCHLD;
@@ -304,7 +304,7 @@ __hidden int map_mips_signum_to_portable(int mips_signum)
#if defined(SIGSTKFLT)
case SIGSTKFLT: /* 16 <--- VOID; NOT SUPPORTED */
ASSERT(mips_signum != SIGSTKFLT_PORTABLE);
return(-1);
return -1;
#endif
case SIGCHLD: /* 17 <-- 18 */
@@ -360,7 +360,7 @@ __hidden int map_mips_signum_to_portable(int mips_signum)
#if 0
LOG_FATAL("%s: mips_signum:%d is not portable;", __func__, mips_signum);
#endif
return(0);
return 0;
}
return portable_ssignum;
}
@@ -466,7 +466,7 @@ static sighandler_t map_portable_sighandler_to_mips(sighandler_portable_t portab
}
ALOGV("%s: return(mips_handler:%p); }", __func__, mips_handler);
return(mips_handler);
return mips_handler;
}
@@ -524,7 +524,7 @@ static sighandler_portable_t _signal_portable(int portable_signum, sighandler_po
}
}
ALOGV("%s: return(ret:%p); }", __func__, ret);
return(ret);
return ret;
}
/*
@@ -544,7 +544,7 @@ sighandler_portable_t signal_portable(int portable_signum, sighandler_portable_t
ret = _signal_portable(portable_signum, handler, bsd_signal, "bsd_signal");
ALOGV("%s: return(ret:%p); }", __func__, ret);
return(ret);
return ret;
}
sighandler_portable_t sysv_signal_portable(int portable_signum, sighandler_portable_t handler)
@@ -559,7 +559,7 @@ sighandler_portable_t sysv_signal_portable(int portable_signum, sighandler_porta
ret = _signal_portable(portable_signum, handler, sysv_signal, "sysv_signal");
ALOGV("%s: return(ret:%p); }", __func__, ret);
return(ret);
return ret;
}
sighandler_portable_t bsd_signal_portable(int portable_signum, sighandler_portable_t handler)
@@ -574,7 +574,7 @@ sighandler_portable_t bsd_signal_portable(int portable_signum, sighandler_portab
ret = _signal_portable(portable_signum, handler, bsd_signal, "bsd_signal");
ALOGV("%s: return(ret:%p); }", __func__, ret);
return(ret);
return ret;
}
static int kill_helper(int id, int portable_signum, int (*fn)(int, int), const char *name)
@@ -647,7 +647,7 @@ int raise_portable(int portable_signum)
rv = raise(mips_signum);
ALOGV("%s: return(rv:%d); }", __func__, rv);
return(rv);
return rv;
}
@@ -763,7 +763,7 @@ static int map_portable_sigaction_flags_to_mips(int portable_flags)
ALOGV("%s(portable_flags:0x%x) return(mips_flags:0x%x);", __func__,
portable_flags, mips_flags);
return(mips_flags);
return mips_flags;
}
int map_mips_sigaction_flags_to_portable(int mips_flags)
@@ -785,7 +785,7 @@ int map_mips_sigaction_flags_to_portable(int mips_flags)
ALOGV("%s(mips_flags:0x%x) return(portable_flags:0x%x);", __func__,
mips_flags, portable_flags);
return(portable_flags);
return portable_flags;
}
/*
@@ -909,7 +909,7 @@ int sigaction_portable(int portable_signum, const struct sigaction_portable *act
done:
ALOGV("%s: return(rv:%d); }", __func__, rv);
return(rv);
return rv;
}
@@ -945,7 +945,7 @@ int sigsuspend_portable(const sigset_portable_t *portable_sigmask)
}
ALOGV("%s: return(rv:%d);", __func__, rv);
return(rv);
return rv;
}
@@ -966,7 +966,7 @@ int sigpending_portable(sigset_portable_t *portable_sigset)
}
ALOGV("%s: return(rv:%d);", __func__, rv);
return(rv);
return rv;
}
@@ -992,7 +992,7 @@ int sigwait_portable(const sigset_portable_t *portable_sigset, int *ptr_to_porta
*ptr_to_portable_sig = portable_sig;
}
ALOGV("%s: return(rv:%d);", __func__, rv);
return(rv);
return rv;
}
@@ -1015,7 +1015,7 @@ int siginterrupt_portable(int portable_signum, int flag)
rv = siginterrupt(mips_signum, flag);
}
ALOGV("%s: return(rv:%d);", __func__, rv);
return(rv);
return rv;
}
__hidden int sigmask_helper(int portable_how, const sigset_portable_t *portable_sigset, sigset_portable_t *portable_oldset, sigmask_fn fn, char *fname)
@@ -1039,7 +1039,7 @@ __hidden int sigmask_helper(int portable_how, const sigset_portable_t *portable_
ALOGE("%s: portable_how:%d NOT SUPPORTED!", __func__, portable_how);
how = -1;
break;
}
}
if (invalid_pointer((void *)portable_sigset)) {
mips_sigset_p = (sigset_t *) portable_sigset;
@@ -1066,7 +1066,7 @@ __hidden int sigmask_helper(int portable_how, const sigset_portable_t *portable_
}
ALOGV("%s: return(rv:%d); }", __func__, rv);
return(rv);
return rv;
}
int sigprocmask_portable(int portable_how,
@@ -1134,7 +1134,7 @@ int sigaltstack_portable(const portable_stack_t *ss, portable_stack_t *oss)
}
ALOGV("%s: return(rv:%d); }", __func__, rv);
return(rv);
return rv;
}

70
ndk/sources/android/libportable/arch-mips/sockopt.c
View File

@@ -27,8 +27,8 @@ static inline int mips_change_level(int level)
{
switch (level) {
case SOL_SOCKET_PORTABLE:
level = SOL_SOCKET;
break;
level = SOL_SOCKET;
break;
}
return level;
}
@@ -38,71 +38,71 @@ static inline int mips_change_optname(int optname)
{
switch (optname) {
case SO_DEBUG_PORTABLE:
return SO_DEBUG;
return SO_DEBUG;
case SO_REUSEADDR_PORTABLE:
return SO_REUSEADDR;
return SO_REUSEADDR;
case SO_TYPE_PORTABLE:
return SO_TYPE;
return SO_TYPE;
case SO_ERROR_PORTABLE:
return SO_ERROR;
return SO_ERROR;
case SO_DONTROUTE_PORTABLE:
return SO_DONTROUTE;
return SO_DONTROUTE;
case SO_BROADCAST_PORTABLE:
return SO_BROADCAST;
return SO_BROADCAST;
case SO_SNDBUF_PORTABLE:
return SO_SNDBUF;
return SO_SNDBUF;
case SO_RCVBUF_PORTABLE:
return SO_RCVBUF;
return SO_RCVBUF;
case SO_SNDBUFFORCE_PORTABLE:
return SO_SNDBUFFORCE;
return SO_SNDBUFFORCE;
case SO_RCVBUFFORCE_PORTABLE:
return SO_RCVBUFFORCE;
return SO_RCVBUFFORCE;
case SO_KEEPALIVE_PORTABLE:
return SO_KEEPALIVE;
return SO_KEEPALIVE;
case SO_OOBINLINE_PORTABLE:
return SO_OOBINLINE;
return SO_OOBINLINE;
case SO_NO_CHECK_PORTABLE:
return SO_NO_CHECK;
return SO_NO_CHECK;
case SO_PRIORITY_PORTABLE:
return SO_PRIORITY;
return SO_PRIORITY;
case SO_LINGER_PORTABLE:
return SO_LINGER;
return SO_LINGER;
case SO_BSDCOMPAT_PORTABLE:
return SO_BSDCOMPAT;
return SO_BSDCOMPAT;
case SO_PASSCRED_PORTABLE:
return SO_PASSCRED;
return SO_PASSCRED;
case SO_PEERCRED_PORTABLE:
return SO_PEERCRED;
return SO_PEERCRED;
case SO_RCVLOWAT_PORTABLE:
return SO_RCVLOWAT;
return SO_RCVLOWAT;
case SO_SNDLOWAT_PORTABLE:
return SO_SNDLOWAT;
return SO_SNDLOWAT;
case SO_RCVTIMEO_PORTABLE:
return SO_RCVTIMEO;
return SO_RCVTIMEO;
case SO_SNDTIMEO_PORTABLE:
return SO_SNDTIMEO;
return SO_SNDTIMEO;
case SO_SECURITY_AUTHENTICATION_PORTABLE:
return SO_SECURITY_AUTHENTICATION;
return SO_SECURITY_AUTHENTICATION;
case SO_SECURITY_ENCRYPTION_TRANSPORT_PORTABLE:
return SO_SECURITY_ENCRYPTION_TRANSPORT;
return SO_SECURITY_ENCRYPTION_TRANSPORT;
case SO_SECURITY_ENCRYPTION_NETWORK_PORTABLE:
return SO_SECURITY_ENCRYPTION_NETWORK;
return SO_SECURITY_ENCRYPTION_NETWORK;
case SO_BINDTODEVICE_PORTABLE:
return SO_BINDTODEVICE;
return SO_BINDTODEVICE;
case SO_ATTACH_FILTER_PORTABLE:
return SO_ATTACH_FILTER;
return SO_ATTACH_FILTER;
case SO_DETACH_FILTER_PORTABLE:
return SO_DETACH_FILTER;
return SO_DETACH_FILTER;
case SO_PEERNAME_PORTABLE:
return SO_PEERNAME;
return SO_PEERNAME;
case SO_TIMESTAMP_PORTABLE:
return SO_TIMESTAMP;
return SO_TIMESTAMP;
case SO_ACCEPTCONN_PORTABLE:
return SO_ACCEPTCONN;
return SO_ACCEPTCONN;
case SO_PEERSEC_PORTABLE:
return SO_PEERSEC;
return SO_PEERSEC;
case SO_PASSSEC_PORTABLE:
return SO_PASSSEC;
return SO_PASSSEC;
}
return optname;
}

11
ndk/sources/android/libportable/arch-mips/syscall.c
View File

@@ -52,14 +52,15 @@ int syscall_portable(int portable_number, ...)
case __NR_add_key_portable: native_number = __NR_add_key; break;
#endif
#ifdef __NR_cacheflush_portable
case __NR_cacheflush_portable:
{
case __NR_cacheflush_portable: {
long start, end, flags;
va_start(ap, portable_number);
start = va_arg(ap, long);
end = va_arg(ap, long);
flags = va_arg(ap, long);
va_end(ap);
return cacheflush(start, end, flags);
}
#endif
@@ -175,8 +176,7 @@ int syscall_portable(int portable_number, ...)
case __NR_syslog_portable: native_number = __NR_syslog; break;
#endif
#ifdef __NR_timer_create_portable
case __NR_timer_create_portable:
{
case __NR_timer_create_portable: {
extern int timer_create_portable(clockid_t, struct sigevent *, timer_t *);
clockid_t clockid;
struct sigevent *evp;
@@ -201,8 +201,7 @@ int syscall_portable(int portable_number, ...)
case __NR_timer_gettime_portable: native_number = __NR_timer_gettime; break;
#endif
#ifdef __NR_tkill_portable
case __NR_tkill_portable:
{
case __NR_tkill_portable: {
extern int tkill_portable(int, int);
int tid, sig;

2
ndk/sources/android/libportable/common/include/log_portable.h
View File

@@ -59,7 +59,7 @@ static inline char *portable_tag() {
strncat(&my_portable_tag[0], ".", MAX_TAG_LEN - strlen(my_portable_tag));
strncat(&my_portable_tag[0], PORTABLE_TAG, MAX_TAG_LEN - strlen(my_portable_tag));
}
return(my_portable_tag);
return my_portable_tag;
}
#define LOG_TAG portable_tag()
#else /* !EXTENDED_LOGGING */