generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

__progname should be const char*, not char*.

Browse Source 
Change-Id: I8e846872c30a712fbc05c8da59ffa1cec1be31a4
This commit is contained in:
Elliott Hughes 2013-02-07 12:06:44 -08:00
parent 2f41531ff9
commit e4ccf5a138
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 <stdarg.h>
#include <errno.h> #include <errno.h>
extern char *__progname; extern const char* __progname;
__noreturn void __noreturn void
err(int eval, const char *fmt, ...) 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); extern "C" int __system_properties_init(void);
// Not public, but well-known in the BSDs. // Not public, but well-known in the BSDs.
char* __progname; const char* __progname;
// Declared in <unistd.h> // Declared in <unistd.h>
char** environ; char** environ;
@ -88,7 +88,7 @@ void __libc_init_common(KernelArgumentBlock& args) {
environ = args.envp; environ = args.envp;
errno = 0; errno = 0;
__libc_auxv = args.auxv; __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. // Get the main thread from TLS and add it to the thread list.
pthread_internal_t* main_thread = __get_thread(); 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 dlmalloc, dlfree, dlcalloc, dlrealloc, dlmemalign
}; };
extern char* __progname; extern const char* __progname;
/* Handle to shared library where actual memory allocation is implemented. /* Handle to shared library where actual memory allocation is implemented.
* This library is loaded and memory allocation calls are redirected there * 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 = static const char* const kEndBanner =
"==============================================================="; "===============================================================";
extern char* __progname; extern const char* __progname;
#define STACK_TRACE_DEPTH 16 #define STACK_TRACE_DEPTH 16

2
libc/unistd/syslog.c
View File

@ -46,7 +46,7 @@
static struct syslog_data sdata = SYSLOG_DATA_INIT; 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 disconnectlog_r(struct syslog_data *); /* disconnect from syslogd */
static void connectlog_r(struct syslog_data *); /* (re)connect to syslogd */ static void connectlog_r(struct syslog_data *); /* (re)connect to syslogd */