diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2009-10-17 10:54:03 -0700 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2009-10-17 10:54:03 -0700 |
commit | cfb6cb21b3db80dd1ec930165cbc866643cfc2cc (patch) | |
tree | 7ca11d05c4246946d7ab9a2f0bae95318d02597f | |
parent | 4abe7c1ce9e466a08e3218ce1cb05191f981c284 (diff) | |
download | uClibc-alpine-cfb6cb21b3db80dd1ec930165cbc866643cfc2cc.tar.bz2 uClibc-alpine-cfb6cb21b3db80dd1ec930165cbc866643cfc2cc.tar.xz |
sync a few trivial changes back to master
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
-rw-r--r-- | libc/inet/if_index.c | 2 | ||||
-rw-r--r-- | libc/misc/internals/__uClibc_main.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c index c249ad94f..8efcd2a76 100644 --- a/libc/inet/if_index.c +++ b/libc/inet/if_index.c @@ -54,7 +54,7 @@ if_nametoindex(const char* ifname) strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl (fd, SIOCGIFINDEX, &ifr) < 0) { - /* close never fails here, fd is just a unconnected socket + /* close never fails here, fd is just a unconnected socket. *int saved_errno = errno; */ close_not_cancel_no_status(fd); /*if (saved_errno == EINVAL) diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 67b783517..be63fe4cd 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -39,7 +39,7 @@ #ifndef SHARED -void *__libc_stack_end=NULL; +void *__libc_stack_end = NULL; # ifdef __UCLIBC_HAS_SSP__ # include <dl-osinfo.h> @@ -64,7 +64,7 @@ uintptr_t __guard attribute_relro; # endif /* - * Needed to initialize _dl_phdr when statically linked; + * Needed to initialize _dl_phdr when statically linked */ void internal_function _dl_aux_init (ElfW(auxv_t) *av); @@ -73,9 +73,9 @@ void internal_function _dl_aux_init (ElfW(auxv_t) *av); /* * Prototypes. */ -extern void weak_function _stdio_init(void) attribute_hidden; extern int *weak_const_function __errno_location(void); extern int *weak_const_function __h_errno_location(void); +extern void weak_function _stdio_init(void) attribute_hidden; #ifdef __UCLIBC_HAS_LOCALE__ extern void weak_function _locale_init(void) attribute_hidden; #endif @@ -137,7 +137,7 @@ static void __check_one_fd(int fd, int mode) int nullfd = open(_PATH_DEVNULL, mode); /* /dev/null is major=1 minor=3. Make absolutely certain * that is in fact the device that we have opened and not - * some other wierd file... */ + * some other wierd file... [removed in uclibc] */ if (nullfd!=fd) { abort(); |