tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 59e9a496: Merge "__progname should be const char*, not char*."

Browse source 
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '59e9a496b4341fd2b11d4a01544bf7edf3d00cc5':
  __progname should be const char*, not char*.
This commit is contained in:
Elliott Hughes 2013-02-07 12:34:23 -08:00 committed by Android Git Automerger
commit 8ddef40dad
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/bionic/err.c
View file

@ -34,7 +34,7 @@
#include <stdarg.h>
#include <errno.h>
extern char *__progname;
extern const char* __progname;
__noreturn void
err(int eval, const char *fmt, ...)

4
libc/bionic/libc_init_common.cpp
View file

@ -46,7 +46,7 @@ extern "C" unsigned __get_sp(void);
extern "C" int __system_properties_init(void);
// Not public, but well-known in the BSDs.
char* __progname;
const char* __progname;
// Declared in <unistd.h>
char** environ;
@ -88,7 +88,7 @@ void __libc_init_common(KernelArgumentBlock& args) {
environ = args.envp;
errno = 0;
__libc_auxv = args.auxv;
__progname = args.argv[0] ? args.argv[0] : const_cast<char*>("<unknown>");
__progname = args.argv[0] ? args.argv[0] : "<unknown>";
// Get the main thread from TLS and add it to the thread list.
pthread_internal_t* main_thread = __get_thread();

2
libc/bionic/malloc_debug_common.cpp
View file

@ -256,7 +256,7 @@ static MallocDebug gMallocUse __attribute__((aligned(32))) = {
dlmalloc, dlfree, dlcalloc, dlrealloc, dlmemalign
};
extern char* __progname;
extern const char* __progname;
/* Handle to shared library where actual memory allocation is implemented.
* This library is loaded and memory allocation calls are redirected there

2
libc/bionic/pthread_debug.cpp
View file

@ -116,7 +116,7 @@ static const char* const kStartBanner =
static const char* const kEndBanner =
"===============================================================";
extern char* __progname;
extern const char* __progname;
#define STACK_TRACE_DEPTH 16

2
libc/unistd/syslog.c
View file

@ -46,7 +46,7 @@
static struct syslog_data sdata = SYSLOG_DATA_INIT;
extern char *__progname; /* Program name, from crt0. */
extern const char *__progname; /* Program name, from crt0. */
static void disconnectlog_r(struct syslog_data *); /* disconnect from syslogd */
static void connectlog_r(struct syslog_data *); /* (re)connect to syslogd */