[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20220504122426.11529-2-jmaselbas@kalray.eu>
Date: Wed, 4 May 2022 14:24:26 +0200
From: Jules Maselbas <jmaselbas@...ray.eu>
To: musl@...ts.openwall.com
Cc: Jules Maselbas <jmaselbas@...ray.eu>
Subject: [PATCH v2 2/2] Remove trailing whitespaces tree-wide
Signed-off-by: Jules Maselbas <jmaselbas@...ray.eu>
---
v2: no changes
Makefile | 2 +-
WHATSNEW | 6 +++---
arch/powerpc/pthread_arch.h | 2 +-
dist/config.mak | 2 +-
include/fnmatch.h | 2 +-
include/net/if.h | 2 +-
include/scsi/sg.h | 12 ++++++------
include/sys/cachectl.h | 2 +-
ldso/dynlink.c | 6 +++---
src/aio/aio.c | 2 +-
src/conf/legacy.c | 4 ++--
src/dirent/readdir.c | 2 +-
src/dirent/readdir_r.c | 2 +-
src/fenv/i386/fenv.s | 4 ++--
src/internal/floatscan.c | 2 +-
src/internal/vdso.c | 4 ++--
src/ldso/dlerror.c | 2 +-
src/linux/cache.c | 2 +-
src/locale/dcngettext.c | 2 +-
src/locale/langinfo.c | 2 +-
src/malloc/oldmalloc/malloc_usable_size.c | 2 +-
src/misc/nftw.c | 6 +++---
src/misc/wordexp.c | 2 +-
src/multibyte/mbrtowc.c | 2 +-
src/network/getaddrinfo.c | 2 +-
src/network/getnameinfo.c | 4 ++--
src/process/posix_spawnp.c | 2 +-
src/regex/glob.c | 6 +++---
src/signal/sigset.c | 2 +-
src/stdio/fclose.c | 2 +-
src/stdio/fmemopen.c | 4 ++--
src/stdio/fread.c | 2 +-
src/stdio/fseek.c | 2 +-
src/stdio/open_wmemstream.c | 2 +-
src/stdio/perror.c | 2 +-
src/stdio/popen.c | 2 +-
src/stdio/vfprintf.c | 2 +-
src/string/arm/memcpy.S | 2 +-
src/string/i386/memset.s | 4 ++--
src/thread/powerpc/clone.s | 2 +-
src/thread/powerpc/syscall_cp.s | 14 +++++++-------
src/thread/pthread_barrier_wait.c | 2 +-
src/thread/pthread_cond_timedwait.c | 6 +++---
src/thread/pthread_mutex_timedlock.c | 2 +-
src/thread/pthread_rwlock_timedrdlock.c | 2 +-
src/thread/pthread_rwlock_timedwrlock.c | 4 ++--
src/time/__tz.c | 2 +-
src/unistd/faccessat.c | 2 +-
48 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/Makefile b/Makefile
index e8cc4436..1851ff3b 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ LIBCC = -lgcc
CPPFLAGS =
CFLAGS =
CFLAGS_AUTO = -Os -pipe
-CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc
+CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc
CFLAGS_ALL = $(CFLAGS_C99FSE)
CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I$(srcdir)/arch/$(ARCH) -I$(srcdir)/arch/generic -Iobj/src/internal -I$(srcdir)/src/include -I$(srcdir)/src/internal -Iobj/include -I$(srcdir)/include
diff --git a/WHATSNEW b/WHATSNEW
index f9bb2482..5939f106 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -363,7 +363,7 @@ bug fixes:
0.8.4 release notes
-new features:
+new features:
- arm dynamic linker support
- process-shared pthread barriers now work
- efficient futex-requeue-based cond var broadcast
@@ -825,7 +825,7 @@ optimizations:
library bugs fixed:
- calling getenv from shared library ctors was broken
- invalid read in mmap-serviced aligned_alloc/memalign (possible crash)
-- wrong errno result in fallback path of pipe2
+- wrong errno result in fallback path of pipe2
- various math functions raising spurious exceptions
- mmap errno value on invalid offsets
- backwards alignment logic in strlcpy
@@ -869,7 +869,7 @@ header compatibility improvements:
0.9.10 release notes
new features:
-- getifaddrs
+- getifaddrs
- pthread_getattr_np (widely used by garbage collectors)
- mkostemps, mkostemp, mkstemps functions (mkostemp is future-POSIX)
- strcasestr and strverscmp (previously stubs)
diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h
index 42e88b07..65e136f6 100644
--- a/arch/powerpc/pthread_arch.h
+++ b/arch/powerpc/pthread_arch.h
@@ -4,7 +4,7 @@ static inline uintptr_t __get_tp()
__asm__ ("" : "=r" (tp) );
return tp;
}
-
+
#define TLS_ABOVE_TP
#define GAP_ABOVE_TP 0
diff --git a/dist/config.mak b/dist/config.mak
index 1fc43695..50333696 100644
--- a/dist/config.mak
+++ b/dist/config.mak
@@ -33,4 +33,4 @@ syslibdir = /lib
#CFLAGS += -Werror -Wall -Wpointer-arith -Wcast-align -Wno-parentheses -Wno-char-subscripts -Wno-uninitialized -Wno-sequence-point -Wno-missing-braces -Wno-unused-value -Wno-overflow -Wno-int-to-pointer-cast
# Uncomment if you want to disable building the shared library.
-#SHARED_LIBS =
+#SHARED_LIBS =
diff --git a/include/fnmatch.h b/include/fnmatch.h
index f9593217..17456ccc 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -8,7 +8,7 @@ extern "C" {
#define FNM_PATHNAME 0x1
#define FNM_NOESCAPE 0x2
#define FNM_PERIOD 0x4
-#define FNM_LEADING_DIR 0x8
+#define FNM_LEADING_DIR 0x8
#define FNM_CASEFOLD 0x10
#define FNM_FILE_NAME FNM_PATHNAME
diff --git a/include/net/if.h b/include/net/if.h
index 774cbff0..e3468416 100644
--- a/include/net/if.h
+++ b/include/net/if.h
@@ -114,7 +114,7 @@ struct ifreq {
#define _IOT_ifreq_int _IOT(_IOTS(char),IFNAMSIZ,_IOTS(int),1,0,0)
struct ifconf {
- int ifc_len;
+ int ifc_len;
union {
char *ifcu_buf;
struct ifreq *ifcu_req;
diff --git a/include/scsi/sg.h b/include/scsi/sg.h
index a7ac247e..5f8f2867 100644
--- a/include/scsi/sg.h
+++ b/include/scsi/sg.h
@@ -61,9 +61,9 @@ typedef struct sg_iovec {
unsigned long iov_len;
} sg_iovec_t;
-typedef struct sg_io_hdr {
- int interface_id;
- int dxfer_direction;
+typedef struct sg_io_hdr {
+ int interface_id;
+ int dxfer_direction;
unsigned char cmd_len;
unsigned char mx_sb_len;
unsigned short iovec_count;
@@ -81,7 +81,7 @@ typedef struct sg_io_hdr {
unsigned char sb_len_wr;
unsigned short host_status;
unsigned short driver_status;
- int resid;
+ int resid;
unsigned int duration;
unsigned int info;
} sg_io_hdr_t;
@@ -104,8 +104,8 @@ typedef struct sg_req_info {
char problem;
int pack_id;
void *usr_ptr;
- unsigned duration;
- int unused;
+ unsigned duration;
+ int unused;
} sg_req_info_t;
typedef struct sg_io_hdr Sg_io_hdr;
diff --git a/include/sys/cachectl.h b/include/sys/cachectl.h
index f3b896a8..f675dbe5 100644
--- a/include/sys/cachectl.h
+++ b/include/sys/cachectl.h
@@ -10,7 +10,7 @@ extern "C" {
#define BCACHE (ICACHE|DCACHE)
#define CACHEABLE 0
#define UNCACHEABLE 1
-
+
int cachectl(void *, int, int);
int cacheflush(void *, int, int);
int _flush_cache(void *, int, int);
diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index 5b9c8be4..3358faf8 100644
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -1264,7 +1264,7 @@ static void extend_bfs_deps(struct dso *p)
struct dso *dep = p->deps[i];
for (j=cnt=0; j<dep->ndeps_direct; j++)
if (!dep->deps[j]->mark) cnt++;
- tmp = no_realloc ?
+ tmp = no_realloc ?
malloc(sizeof(*tmp) * (ndeps_all+cnt+1)) :
realloc(p->deps, sizeof(*tmp) * (ndeps_all+cnt+1));
if (!tmp) {
@@ -1521,7 +1521,7 @@ static void do_init_fini(struct dso **queue)
if (p->ctor_visitor || p->constructed)
continue;
p->ctor_visitor = self;
-
+
decode_vec(p->dynv, dyn, DYN_CNT);
if (dyn[0] & ((1<<DT_FINI) | (1<<DT_FINI_ARRAY))) {
p->fini_next = fini_head;
@@ -1632,7 +1632,7 @@ static void install_new_tls(void)
* following stage 2 and stage 3 functions via primitive symbolic lookup
* since it does not have access to their addresses to begin with. */
-/* Stage 2 of the dynamic linker is called after relative relocations
+/* Stage 2 of the dynamic linker is called after relative relocations
* have been processed. It can make function calls to static functions
* and access string literals and static data, but cannot use extern
* symbols. Its job is to perform symbolic relocations on the dynamic
diff --git a/src/aio/aio.c b/src/aio/aio.c
index a1a3e791..d8926d54 100644
--- a/src/aio/aio.c
+++ b/src/aio/aio.c
@@ -267,7 +267,7 @@ static void *io_thread_func(void *ctx)
}
at.ret = ret;
at.err = ret<0 ? errno : 0;
-
+
pthread_cleanup_pop(1);
return 0;
diff --git a/src/conf/legacy.c b/src/conf/legacy.c
index f1d9e325..891f6dbb 100644
--- a/src/conf/legacy.c
+++ b/src/conf/legacy.c
@@ -13,10 +13,10 @@ int get_nprocs()
long get_phys_pages()
{
- return sysconf(_SC_PHYS_PAGES);
+ return sysconf(_SC_PHYS_PAGES);
}
long get_avphys_pages()
{
- return sysconf(_SC_AVPHYS_PAGES);
+ return sysconf(_SC_AVPHYS_PAGES);
}
diff --git a/src/dirent/readdir.c b/src/dirent/readdir.c
index 569fc705..6d60c9ed 100644
--- a/src/dirent/readdir.c
+++ b/src/dirent/readdir.c
@@ -10,7 +10,7 @@ typedef char dirstream_buf_alignment_check[1-2*(int)(
struct dirent *readdir(DIR *dir)
{
struct dirent *de;
-
+
if (dir->buf_pos >= dir->buf_end) {
int len = __syscall(SYS_getdents, dir->fd, dir->buf, sizeof dir->buf);
if (len <= 0) {
diff --git a/src/dirent/readdir_r.c b/src/dirent/readdir_r.c
index e2a818f3..b1fa4727 100644
--- a/src/dirent/readdir_r.c
+++ b/src/dirent/readdir_r.c
@@ -9,7 +9,7 @@ int readdir_r(DIR *restrict dir, struct dirent *restrict buf, struct dirent **re
struct dirent *de;
int errno_save = errno;
int ret;
-
+
LOCK(dir->lock);
errno = 0;
de = readdir(dir);
diff --git a/src/fenv/i386/fenv.s b/src/fenv/i386/fenv.s
index e7f7932a..dfd23235 100644
--- a/src/fenv/i386/fenv.s
+++ b/src/fenv/i386/fenv.s
@@ -2,7 +2,7 @@
.global feclearexcept
.type feclearexcept,@function
-feclearexcept:
+feclearexcept:
mov 4(%esp),%ecx
and $0x3f,%ecx
fnstsw %ax
@@ -49,7 +49,7 @@ feclearexcept:
.global feraiseexcept
.type feraiseexcept,@function
-feraiseexcept:
+feraiseexcept:
mov 4(%esp),%eax
and $0x3f,%eax
sub $32,%esp
diff --git a/src/internal/floatscan.c b/src/internal/floatscan.c
index 8c0828fc..f84ae807 100644
--- a/src/internal/floatscan.c
+++ b/src/internal/floatscan.c
@@ -39,7 +39,7 @@ static long long scanexp(FILE *f, int pok)
int x;
long long y;
int neg = 0;
-
+
c = shgetc(f);
if (c=='+' || c=='-') {
neg = (c=='-');
diff --git a/src/internal/vdso.c b/src/internal/vdso.c
index d46d3228..087333d5 100644
--- a/src/internal/vdso.c
+++ b/src/internal/vdso.c
@@ -62,7 +62,7 @@ void *__vdsosym(const char *vername, const char *name)
Elf_Symndx *hashtab = 0;
uint16_t *versym = 0;
Verdef *verdef = 0;
-
+
for (i=0; dynv[i]; i+=2) {
void *p = (void *)(base + dynv[i+1]);
switch(dynv[i]) {
@@ -72,7 +72,7 @@ void *__vdsosym(const char *vername, const char *name)
case DT_VERSYM: versym = p; break;
case DT_VERDEF: verdef = p; break;
}
- }
+ }
if (!strings || !syms || !hashtab) return 0;
if (!verdef) versym = 0;
diff --git a/src/ldso/dlerror.c b/src/ldso/dlerror.c
index afe59253..855ff9a5 100644
--- a/src/ldso/dlerror.c
+++ b/src/ldso/dlerror.c
@@ -64,7 +64,7 @@ hidden void __dl_vseterr(const char *fmt, va_list ap)
if (buf) {
vsnprintf(buf, len+1, fmt, ap);
} else {
- buf = (void *)-1;
+ buf = (void *)-1;
}
self->dlerror_buf = buf;
self->dlerror_flag = 1;
diff --git a/src/linux/cache.c b/src/linux/cache.c
index 0eb051c2..12f1575b 100644
--- a/src/linux/cache.c
+++ b/src/linux/cache.c
@@ -36,7 +36,7 @@ static int flush_icache_init(void *start, void *end, unsigned long int flags)
static void *volatile vdso_func = (void *)flush_icache_init;
-int __riscv_flush_icache(void *start, void *end, unsigned long int flags)
+int __riscv_flush_icache(void *start, void *end, unsigned long int flags)
{
int (*f)(void *, void *, unsigned long int) =
(int (*)(void *, void *, unsigned long int))vdso_func;
diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c
index 0b53286d..5b8576ba 100644
--- a/src/locale/dcngettext.c
+++ b/src/locale/dcngettext.c
@@ -89,7 +89,7 @@ char *bindtextdomain(const char *domainname, const char *dirname)
}
UNLOCK(lock);
-
+
return (char *)p->dirname;
}
diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c
index 14773093..7953c384 100644
--- a/src/locale/langinfo.c
+++ b/src/locale/langinfo.c
@@ -37,7 +37,7 @@ char *__nl_langinfo_l(nl_item item, locale_t loc)
/* _NL_LOCALE_NAME extension */
if (idx == 65535 && cat < LC_ALL)
return loc->cat[cat] ? (char *)loc->cat[cat]->name : "C";
-
+
switch (cat) {
case LC_NUMERIC:
if (idx > 1) return "";
diff --git a/src/malloc/oldmalloc/malloc_usable_size.c b/src/malloc/oldmalloc/malloc_usable_size.c
index 672b518a..69ad5479 100644
--- a/src/malloc/oldmalloc/malloc_usable_size.c
+++ b/src/malloc/oldmalloc/malloc_usable_size.c
@@ -1,6 +1,6 @@
#include <malloc.h>
#include "malloc_impl.h"
-
+
hidden void *(*const __realloc_dep)(void *, size_t) = realloc;
size_t malloc_usable_size(void *p)
diff --git a/src/misc/nftw.c b/src/misc/nftw.c
index 8dcff7fe..4412bde7 100644
--- a/src/misc/nftw.c
+++ b/src/misc/nftw.c
@@ -48,13 +48,13 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
if ((flags & FTW_MOUNT) && h && st.st_dev != h->dev)
return 0;
-
+
new.chain = h;
new.dev = st.st_dev;
new.ino = st.st_ino;
new.level = h ? h->level+1 : 0;
new.base = j+1;
-
+
lev.level = new.level;
if (h) {
lev.base = h->base;
@@ -132,7 +132,7 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
return -1;
}
memcpy(pathbuf, path, l+1);
-
+
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
r = do_nftw(pathbuf, fn, fd_limit, flags, NULL);
pthread_setcancelstate(cs, 0);
diff --git a/src/misc/wordexp.c b/src/misc/wordexp.c
index db83a69f..95e2bdbf 100644
--- a/src/misc/wordexp.c
+++ b/src/misc/wordexp.c
@@ -114,7 +114,7 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags)
_exit(1);
}
close(p[1]);
-
+
f = fdopen(p[0], "r");
if (!f) {
close(p[0]);
diff --git a/src/multibyte/mbrtowc.c b/src/multibyte/mbrtowc.c
index c94819e7..3e73b152 100644
--- a/src/multibyte/mbrtowc.c
+++ b/src/multibyte/mbrtowc.c
@@ -13,7 +13,7 @@ size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate
if (!st) st = (void *)&internal_state;
c = *(unsigned *)st;
-
+
if (!s) {
if (c) goto ilseq;
return 0;
diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index efaab306..4350847f 100644
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -126,7 +126,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
out[k].sa.sin6.sin6_port = htons(ports[j].port);
out[k].sa.sin6.sin6_scope_id = addrs[i].scopeid;
memcpy(&out[k].sa.sin6.sin6_addr, &addrs[i].addr, 16);
- break;
+ break;
}
}
out[0].ref = nais;
diff --git a/src/network/getnameinfo.c b/src/network/getnameinfo.c
index 949e1811..684b6eeb 100644
--- a/src/network/getnameinfo.c
+++ b/src/network/getnameinfo.c
@@ -70,7 +70,7 @@ static void reverse_hosts(char *buf, const unsigned char *a, unsigned scopeid, i
if (memcmp(a, iplit.addr, 16) || iplit.scopeid != scopeid)
continue;
-
+
for (; *p && isspace(*p); p++);
for (z=p; *z && !isspace(*z); z++);
*z = 0;
@@ -115,7 +115,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const
data, c, 256) <= 0)
*(char *)c = 0;
return 0;
-
+
}
int getnameinfo(const struct sockaddr *restrict sa, socklen_t sl,
diff --git a/src/process/posix_spawnp.c b/src/process/posix_spawnp.c
index aad6133b..995a49d0 100644
--- a/src/process/posix_spawnp.c
+++ b/src/process/posix_spawnp.c
@@ -8,6 +8,6 @@ int posix_spawnp(pid_t *restrict res, const char *restrict file,
{
posix_spawnattr_t spawnp_attr = { 0 };
if (attr) spawnp_attr = *attr;
- spawnp_attr.__fn = (void *)__execvpe;
+ spawnp_attr.__fn = (void *)__execvpe;
return posix_spawn(res, file, fa, &spawnp_attr, argv, envp);
}
diff --git a/src/regex/glob.c b/src/regex/glob.c
index 9de080ed..0992117d 100644
--- a/src/regex/glob.c
+++ b/src/regex/glob.c
@@ -231,7 +231,7 @@ int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, i
size_t offs = (flags & GLOB_DOOFFS) ? g->gl_offs : 0;
int error = 0;
char buf[PATH_MAX];
-
+
if (!errfunc) errfunc = ignore_err;
if (!(flags & GLOB_APPEND)) {
@@ -257,7 +257,7 @@ int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, i
freelist(&head);
return error;
}
-
+
for (cnt=0, tail=head.next; tail; tail=tail->next, cnt++);
if (!cnt) {
if (flags & GLOB_NOCHECK) {
@@ -293,7 +293,7 @@ int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, i
if (!(flags & GLOB_NOSORT))
qsort(g->gl_pathv+offs, cnt, sizeof(char *), sort);
-
+
return error;
}
diff --git a/src/signal/sigset.c b/src/signal/sigset.c
index f3e8c407..6da6074d 100644
--- a/src/signal/sigset.c
+++ b/src/signal/sigset.c
@@ -8,7 +8,7 @@ void (*sigset(int sig, void (*handler)(int)))(int)
sigemptyset(&mask);
if (sigaddset(&mask, sig) < 0)
return SIG_ERR;
-
+
if (handler == SIG_HOLD) {
if (sigaction(sig, 0, &sa_old) < 0)
return SIG_ERR;
diff --git a/src/stdio/fclose.c b/src/stdio/fclose.c
index d594532b..029e4290 100644
--- a/src/stdio/fclose.c
+++ b/src/stdio/fclose.c
@@ -7,7 +7,7 @@ weak_alias(dummy, __unlist_locked_file);
int fclose(FILE *f)
{
int r;
-
+
FLOCK(f);
r = fflush(f);
r |= f->close(f);
diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c
index 343e3e3f..e567242c 100644
--- a/src/stdio/fmemopen.c
+++ b/src/stdio/fmemopen.c
@@ -83,7 +83,7 @@ FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)
{
struct mem_FILE *f;
int plus = !!strchr(mode, '+');
-
+
if (!strchr("rwa", *mode)) {
errno = EINVAL;
return 0;
@@ -110,7 +110,7 @@ FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)
f->c.buf = buf;
f->c.size = size;
f->c.mode = *mode;
-
+
if (!plus) f->f.flags = (*mode == 'r') ? F_NOWR : F_NORD;
if (*mode == 'r') f->c.len = size;
else if (*mode == 'a') f->c.len = f->c.pos = strnlen(buf, size);
diff --git a/src/stdio/fread.c b/src/stdio/fread.c
index a2116da6..2587268b 100644
--- a/src/stdio/fread.c
+++ b/src/stdio/fread.c
@@ -21,7 +21,7 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f)
dest += k;
l -= k;
}
-
+
/* Read the remainder directly */
for (; l; l-=k, dest+=k) {
k = __toread(f) ? 0 : f->read(f, dest, l);
diff --git a/src/stdio/fseek.c b/src/stdio/fseek.c
index c07f7e95..1b3a7cce 100644
--- a/src/stdio/fseek.c
+++ b/src/stdio/fseek.c
@@ -27,7 +27,7 @@ int __fseeko_unlocked(FILE *f, off_t off, int whence)
/* If seek succeeded, file is seekable and we discard read buffer. */
f->rpos = f->rend = 0;
f->flags &= ~F_EOF;
-
+
return 0;
}
diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c
index ed1b561d..20ae2482 100644
--- a/src/stdio/open_wmemstream.c
+++ b/src/stdio/open_wmemstream.c
@@ -51,7 +51,7 @@ static size_t wms_write(FILE *f, const unsigned char *buf, size_t len)
memset(c->buf + c->space, 0, 4*(len2 - c->space));
c->space = len2;
}
-
+
len2 = mbsnrtowcs(c->buf+c->pos, (void *)&buf, len, c->space-c->pos, &c->mbs);
if (len2 == -1) return 0;
c->pos += len2;
diff --git a/src/stdio/perror.c b/src/stdio/perror.c
index d0943f26..03ffeab8 100644
--- a/src/stdio/perror.c
+++ b/src/stdio/perror.c
@@ -14,7 +14,7 @@ void perror(const char *msg)
* permitted to change them. */
void *old_locale = f->locale;
int old_mode = f->mode;
-
+
if (msg && *msg) {
fwrite(msg, strlen(msg), 1, f);
fputc(':', f);
diff --git a/src/stdio/popen.c b/src/stdio/popen.c
index 3ec83394..27f0d346 100644
--- a/src/stdio/popen.c
+++ b/src/stdio/popen.c
@@ -23,7 +23,7 @@ FILE *popen(const char *cmd, const char *mode)
errno = EINVAL;
return 0;
}
-
+
if (pipe2(p, O_CLOEXEC)) return NULL;
f = fdopen(p[op], mode);
if (!f) {
diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index 9b961e7f..d44e3fa1 100644
--- a/src/stdio/vfprintf.c
+++ b/src/stdio/vfprintf.c
@@ -341,7 +341,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
if (z>d+1) z=d+1;
}
for (; z>a && !z[-1]; z--);
-
+
if ((t|32)=='g') {
if (!p) p++;
if (p>e && e>=-4) {
diff --git a/src/string/arm/memcpy.S b/src/string/arm/memcpy.S
index 869e3448..1ff69b9a 100644
--- a/src/string/arm/memcpy.S
+++ b/src/string/arm/memcpy.S
@@ -148,7 +148,7 @@ cached_aligned32:
1: ldmia r1!, { r4-r11 }
subs r2, r2, #32
- /*
+ /*
* NOTE: if r12 is more than 64 ahead of r1, the following ldrhi
* for ARM9 preload will not be safely guarded by the preceding subs.
* When it is safely guarded the only possibility to have SIGSEGV here
diff --git a/src/string/i386/memset.s b/src/string/i386/memset.s
index d00422c4..b8a38571 100644
--- a/src/string/i386/memset.s
+++ b/src/string/i386/memset.s
@@ -47,7 +47,7 @@ memset:
mov %edx,(-1-2-4-8-8)(%eax,%ecx)
mov %edx,(-1-2-4-8-4)(%eax,%ecx)
-1: ret
+1: ret
2: movzbl 8(%esp),%eax
mov %edi,12(%esp)
@@ -63,7 +63,7 @@ memset:
mov 4(%esp),%eax
mov 12(%esp),%edi
ret
-
+
2: xor %edx,%edx
sub %edi,%edx
and $15,%edx
diff --git a/src/thread/powerpc/clone.s b/src/thread/powerpc/clone.s
index da13f446..b5dc3cbe 100644
--- a/src/thread/powerpc/clone.s
+++ b/src/thread/powerpc/clone.s
@@ -35,7 +35,7 @@ mr 5, 7
mr 6, 8
mr 7, 9
-# move syscall number into r0
+# move syscall number into r0
li 0, 120
sc
diff --git a/src/thread/powerpc/syscall_cp.s b/src/thread/powerpc/syscall_cp.s
index 77f8938d..8a74596d 100644
--- a/src/thread/powerpc/syscall_cp.s
+++ b/src/thread/powerpc/syscall_cp.s
@@ -20,7 +20,7 @@
#r1, r14-31: belong to the caller, must be saved and restored
#r0, r3-r12, ctr, xer: volatile, not preserved
-#r0,r11,r12: may be altered by cross-module call,
+#r0,r11,r12: may be altered by cross-module call,
#"a func cannot depend on that these regs have the values placed by the caller"
#the fields CR2,CR2,CR4 of the cond reg must be preserved
@@ -30,14 +30,14 @@
__syscall_cp_asm:
# at enter: r3 = pointer to self->cancel, r4: syscall no, r5: first arg, r6: 2nd, r7: 3rd, r8: 4th, r9: 5th, r10: 6th
__cp_begin:
- # r3 holds first argument, its a pointer to self->cancel.
+ # r3 holds first argument, its a pointer to self->cancel.
# we must compare the dereferenced value with 0 and jump to __cancel if its not
-
+
lwz 0, 0(3) #deref pointer into r0
-
- cmpwi cr7, 0, 0 #compare r0 with 0, store result in cr7.
+
+ cmpwi cr7, 0, 0 #compare r0 with 0, store result in cr7.
beq+ cr7, 1f #jump to label 1 if r0 was 0
-
+
b __cp_cancel #else call cancel
1:
#ok, the cancel flag was not set
@@ -51,7 +51,7 @@ __cp_begin:
mr 8, 10 # arg6
sc
__cp_end:
- bnslr+ # return if no summary overflow.
+ bnslr+ # return if no summary overflow.
#else negate result.
neg 3, 3
blr
diff --git a/src/thread/pthread_barrier_wait.c b/src/thread/pthread_barrier_wait.c
index cc2a8bbf..617445c2 100644
--- a/src/thread/pthread_barrier_wait.c
+++ b/src/thread/pthread_barrier_wait.c
@@ -33,7 +33,7 @@ static int pshared_barrier_wait(pthread_barrier_t *b)
while ((v=b->_b_count))
__wait(&b->_b_count, &b->_b_waiters2, v, 0);
}
-
+
/* Perform a recursive unlock suitable for self-sync'd destruction */
do {
v = b->_b_lock;
diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 6b761455..c5b35a6c 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -121,12 +121,12 @@ int __pthread_cond_timedwait(pthread_cond_t *restrict c, pthread_mutex_t *restri
* via the futex notify below. */
lock(&c->_c_lock);
-
+
if (c->_c_head == &node) c->_c_head = node.next;
else if (node.prev) node.prev->next = node.next;
if (c->_c_tail == &node) c->_c_tail = node.prev;
else if (node.next) node.next->prev = node.prev;
-
+
unlock(&c->_c_lock);
if (node.notify) {
@@ -156,7 +156,7 @@ relock:
if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
} else if (!(m->_m_type & 8)) {
- a_dec(&m->_m_waiters);
+ a_dec(&m->_m_waiters);
}
/* Since a signal was consumed, cancellation is not permitted. */
diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c
index 9279fc54..87f89287 100644
--- a/src/thread/pthread_mutex_timedlock.c
+++ b/src/thread/pthread_mutex_timedlock.c
@@ -66,7 +66,7 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec
if (r != EBUSY) return r;
if (type&8) return pthread_mutex_timedlock_pi(m, at);
-
+
int spins = 100;
while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
diff --git a/src/thread/pthread_rwlock_timedrdlock.c b/src/thread/pthread_rwlock_timedrdlock.c
index 8cdd8ecf..3eccdc12 100644
--- a/src/thread/pthread_rwlock_timedrdlock.c
+++ b/src/thread/pthread_rwlock_timedrdlock.c
@@ -6,7 +6,7 @@ int __pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct tim
r = pthread_rwlock_tryrdlock(rw);
if (r != EBUSY) return r;
-
+
int spins = 100;
while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
diff --git a/src/thread/pthread_rwlock_timedwrlock.c b/src/thread/pthread_rwlock_timedwrlock.c
index d77706e6..2a7eebe7 100644
--- a/src/thread/pthread_rwlock_timedwrlock.c
+++ b/src/thread/pthread_rwlock_timedwrlock.c
@@ -3,10 +3,10 @@
int __pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
{
int r, t;
-
+
r = pthread_rwlock_trywrlock(rw);
if (r != EBUSY) return r;
-
+
int spins = 100;
while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
diff --git a/src/time/__tz.c b/src/time/__tz.c
index c34b3eb7..e9950028 100644
--- a/src/time/__tz.c
+++ b/src/time/__tz.c
@@ -164,7 +164,7 @@ static void do_tzset()
|| !strcmp(dummy_name, "UTC")
|| !strcmp(dummy_name, "GMT")))
posix_form = 1;
- }
+ }
/* Non-suid can use an absolute tzfile pathname or a relative
* pathame beginning with "."; in secure mode, only the
diff --git a/src/unistd/faccessat.c b/src/unistd/faccessat.c
index 557503eb..e330763f 100644
--- a/src/unistd/faccessat.c
+++ b/src/unistd/faccessat.c
@@ -46,7 +46,7 @@ int faccessat(int fd, const char *filename, int amode, int flag)
struct ctx c = { .fd = fd, .filename = filename, .amode = amode, .p = p[1] };
__block_all_sigs(&set);
-
+
pid = __clone(checker, stack+sizeof stack, 0, &c);
__syscall(SYS_close, p[1]);
--
2.17.1
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
