diff --git a/features/alignment.c b/features/alignment.c index 4345628a9cbf..83ef3b9c64b9 100644 --- a/features/alignment.c +++ b/features/alignment.c @@ -2,116 +2,99 @@ // chain. // // TODO: Check if this test can be trimmed down in size. -#include -#include #include +#include +#include -union _u_ -{ - long u1; - char* u2; - double u3; - char u4[1024]; - intmax_t u5; - uintmax_t u6; - long double u7; - void* u8; - char* (*u9)(); - jmp_buf u10; +union _u_ { + long u1; + char *u2; + double u3; + char u4[1024]; + intmax_t u5; + uintmax_t u6; + long double u7; + void *u8; + char *(*u9)(); + jmp_buf u10; }; -struct _s_ -{ - char s1; - union _u_ s2; +struct _s_ { + char s1; + union _u_ s2; }; -#define roundof(x,y) (((x)+((y)-1))&~((y)-1)) +#define roundof(x, y) (((x) + ((y)-1)) & ~((y)-1)) -static union _u_ u; -static union _u_ v; +static union _u_ u; +static union _u_ v; -int -main() -{ - int i; - int j; - int k; +int main() { + int i; + int j; + int k; - int align0; - int align1; - int align2; - unsigned long bit1; - unsigned long bit2; - unsigned long bits0; - unsigned long bits1; - unsigned long bits2; + int align0; + int align1; + int align2; + unsigned long bit1; + unsigned long bit2; + unsigned long bits0; + unsigned long bits1; + unsigned long bits2; - u.u2 = u.u4; - v.u2 = u.u2 + 1; - bit1 = u.u1 ^ v.u1; - v.u2 = u.u2 + 2; - bit2 = u.u1 ^ v.u1; - align0 = sizeof(struct _s_) - sizeof(union _u_); - bits0 = 0; - k = 0; - for (j = 0; j < align0; j++) - { - u.u2 = u.u4 + j; - bits1 = 0; - for (i = 0; i < align0; i++) - { - v.u2 = u.u2 + i; - bits1 |= u.u1 ^ v.u1; - } - if (!bits0 || bits1 < bits0) - { - bits0 = bits1; - k = j; - } - } - align1 = roundof(align0, 2); - u.u2 = u.u4 + k; - for (bits1 = bits0; i < align1; i++) - { - v.u2 = u.u2 + i; - bits1 |= u.u1 ^ v.u1; - } - align2 = roundof(align0, 4); - for (bits2 = bits1; i < align2; i++) - { - v.u2 = u.u2 + i; - bits2 |= u.u1 ^ v.u1; - } + u.u2 = u.u4; + v.u2 = u.u2 + 1; + bit1 = u.u1 ^ v.u1; + v.u2 = u.u2 + 2; + bit2 = u.u1 ^ v.u1; + align0 = sizeof(struct _s_) - sizeof(union _u_); + bits0 = 0; + k = 0; + for (j = 0; j < align0; j++) { + u.u2 = u.u4 + j; + bits1 = 0; + for (i = 0; i < align0; i++) { + v.u2 = u.u2 + i; + bits1 |= u.u1 ^ v.u1; + } + if (!bits0 || bits1 < bits0) { + bits0 = bits1; + k = j; + } + } + align1 = roundof(align0, 2); + u.u2 = u.u4 + k; + for (bits1 = bits0; i < align1; i++) { + v.u2 = u.u2 + i; + bits1 |= u.u1 ^ v.u1; + } + align2 = roundof(align0, 4); + for (bits2 = bits1; i < align2; i++) { + v.u2 = u.u2 + i; + bits2 |= u.u1 ^ v.u1; + } #if _X86_ || _X64_ - #if _X64 - printf("ALIGN_BOUND2 16\n"); - #else - printf("ALIGN_BOUND2 8\n"); - #endif +#if _X64 + printf("ALIGN_BOUND2 16\n"); +#else + printf("ALIGN_BOUND2 8\n"); +#endif #else - printf("ALIGN_BOUND2 %d\n", align2); + printf("ALIGN_BOUND2 %d\n", align2); #endif - if (align1 == align2) - { - printf("ALIGN_BOUND1 ALIGN_BOUND2\n"); - } - else - { - printf("ALIGN_BOUND1 %d\n", align1); - } + if (align1 == align2) { + printf("ALIGN_BOUND1 ALIGN_BOUND2\n"); + } else { + printf("ALIGN_BOUND1 %d\n", align1); + } - if (align0 == align2) - { - printf("ALIGN_BOUND ALIGN_BOUND2\n"); - } - else if (align0 == align1) - { - printf("ALIGN_BOUND ALIGN_BOUND1\n"); - } - else - { - printf("ALIGN_BOUND 1\n"); - } + if (align0 == align2) { + printf("ALIGN_BOUND ALIGN_BOUND2\n"); + } else if (align0 == align1) { + printf("ALIGN_BOUND ALIGN_BOUND1\n"); + } else { + printf("ALIGN_BOUND 1\n"); + } return 0; } diff --git a/features/dll/dll.c b/features/dll/dll.c index 83c6c8019d7b..89d197d21f2c 100644 --- a/features/dll/dll.c +++ b/features/dll/dll.c @@ -1,7 +1,7 @@ // TODO: Modify this to work with the Meson build system and add it to the meson.build config file. #if defined(__MVS__) && !defined(__SUSV3) -#define __SUSV3 1 +#define __SUSV3 1 #endif #if _hdr_dlfcn && _lib_dlopen #include @@ -10,171 +10,165 @@ #include #endif int main() { - int i; + int i; #if _hdr_rld_interface - void* dll; - static char* local[] = { "__elf_header", "_call_add_gp_range", "_etext" }; + void *dll; + static char *local[] = {"__elf_header", "_call_add_gp_range", "_etext"}; #endif - printf("\n"); - printf("#if defined(__MVS__) && !defined(__SUSV3)\n"); - printf("#define __SUSV3 1\n"); - printf("#endif\n"); + printf("\n"); + printf("#if defined(__MVS__) && !defined(__SUSV3)\n"); + printf("#define __SUSV3 1\n"); + printf("#endif\n"); #if _hdr_dlfcn && _lib_dlopen - printf("#include \n"); + printf("#include \n"); #endif #ifndef RTLD_LAZY - i = 0; - printf("\n"); - printf("#define RTLD_LAZY 1\n"); + i = 0; + printf("\n"); + printf("#define RTLD_LAZY 1\n"); #else - i = 1; + i = 1; #endif #ifndef RTLD_NOW - if (i) - { - i = 0; - printf("\n"); - } - printf("#define RTLD_NOW 2\n"); + if (i) { + i = 0; + printf("\n"); + } + printf("#define RTLD_NOW 2\n"); #endif #ifndef RTLD_GLOBAL - if (i) - { - i = 0; - printf("\n"); - } - printf("#define RTLD_GLOBAL 0\n"); + if (i) { + i = 0; + printf("\n"); + } + printf("#define RTLD_GLOBAL 0\n"); #endif #ifndef RTLD_LOCAL - if (i) - { - i = 0; - printf("\n"); - } - printf("#define RTLD_LOCAL 0\n"); + if (i) { + i = 0; + printf("\n"); + } + printf("#define RTLD_LOCAL 0\n"); #endif #ifndef RTLD_PARENT - if (i) - { - i = 0; - printf("\n"); - } - printf("#define RTLD_PARENT 0\n"); + if (i) { + i = 0; + printf("\n"); + } + printf("#define RTLD_PARENT 0\n"); #endif #if defined(_hdr_mach_o_dyld) && !defined(RTLD_NEXT) - if (i) - { - i = 0; - printf("\n"); - } - printf("#define RTLD_NEXT ((void*)16)\n"); + if (i) { + i = 0; + printf("\n"); + } + printf("#define RTLD_NEXT ((void*)16)\n"); #endif #if _hdr_rld_interface - if (!(dll = dlopen(0, RTLD_LAZY))) - i = -1; - else - { - for (i = 0; i < sizeof(local) / sizeof(local[0]); i++) - if (dlsym(dll, local[i])) - break; - if (i >= sizeof(local) / sizeof(local[0])) - i = -1; - } - if (i >= 0) - { - printf("\n"); - printf("#define _DLL_RLD_SYM %s\n", local[i]); - printf("#define _DLL_RLD_SYM_STR \"%s\"\n", local[i]); - printf("#define _DLL_RLD_SYM_TYPE void*\n"); - } -#endif + if (!(dll = dlopen(0, RTLD_LAZY))) + i = -1; + else { + for (i = 0; i < sizeof(local) / sizeof(local[0]); i++) + if (dlsym(dll, local[i])) break; + if (i >= sizeof(local) / sizeof(local[0])) i = -1; + } + if (i >= 0) { printf("\n"); - printf("#define DLL_INFO_PREVER 0x0001 /* pre-suffix style version */\n"); - printf("#define DLL_INFO_DOTVER 0x0002 /* post-suffix style version */\n"); - printf("\n"); - printf("typedef unsigned long (*Dll_plugin_version_f)(void);\n"); - printf("typedef int (*Dllerror_f)(void*, void*, int, ...);\n"); - printf("\n"); - printf("typedef struct Dllinfo_s\n"); - printf("{\n"); - printf(" char** sibling; /* sibling dirs on $PATH */\n"); - printf(" char* prefix; /* library name prefix */\n"); - printf(" char* suffix; /* library name suffix */\n"); - printf(" char* env; /* library path env var */\n"); - printf(" int flags; /* DLL_INFO_* flags */\n"); - printf("#ifdef _DLLINFO_PRIVATE_\n"); - printf(" _DLLINFO_PRIVATE_\n"); - printf("#endif\n"); - printf("} Dllinfo_t;\n"); - printf("\n"); - printf("typedef struct Dllnames_s\n"); - printf("{\n"); - printf(" char* id;\n"); - printf(" char* name;\n"); - printf(" char* base;\n"); - printf(" char* type;\n"); - printf(" char* opts;\n"); - printf(" char* path;\n"); - printf(" char data[1024];\n"); - printf("} Dllnames_t;\n"); - printf("\n"); - printf("typedef struct Dllent_s\n"); - printf("{\n"); - printf(" char* path;\n"); - printf(" char* name;\n"); - printf("#ifdef _DLLENT_PRIVATE_\n"); - printf(" _DLLENT_PRIVATE_\n"); - printf("#endif\n"); - printf("} Dllent_t;\n"); - printf("\n"); - printf("typedef struct Dllscan_s\n"); - printf("{\n"); - printf(" void* pad;\n"); - printf("#ifdef _DLLSCAN_PRIVATE_\n"); - printf(" _DLLSCAN_PRIVATE_\n"); - printf("#endif\n"); - printf("} Dllscan_t;\n"); + printf("#define _DLL_RLD_SYM %s\n", local[i]); + printf("#define _DLL_RLD_SYM_STR \"%s\"\n", local[i]); + printf("#define _DLL_RLD_SYM_TYPE void*\n"); + } +#endif + printf("\n"); + printf("#define DLL_INFO_PREVER 0x0001 /* pre-suffix style version */\n"); + printf("#define DLL_INFO_DOTVER 0x0002 /* post-suffix style version */\n"); + printf("\n"); + printf("typedef unsigned long (*Dll_plugin_version_f)(void);\n"); + printf("typedef int (*Dllerror_f)(void*, void*, int, ...);\n"); + printf("\n"); + printf("typedef struct Dllinfo_s\n"); + printf("{\n"); + printf(" char** sibling; /* sibling dirs on $PATH */\n"); + printf(" char* prefix; /* library name prefix */\n"); + printf(" char* suffix; /* library name suffix */\n"); + printf(" char* env; /* library path env var */\n"); + printf(" int flags; /* DLL_INFO_* flags */\n"); + printf("#ifdef _DLLINFO_PRIVATE_\n"); + printf(" _DLLINFO_PRIVATE_\n"); + printf("#endif\n"); + printf("} Dllinfo_t;\n"); + printf("\n"); + printf("typedef struct Dllnames_s\n"); + printf("{\n"); + printf(" char* id;\n"); + printf(" char* name;\n"); + printf(" char* base;\n"); + printf(" char* type;\n"); + printf(" char* opts;\n"); + printf(" char* path;\n"); + printf(" char data[1024];\n"); + printf("} Dllnames_t;\n"); + printf("\n"); + printf("typedef struct Dllent_s\n"); + printf("{\n"); + printf(" char* path;\n"); + printf(" char* name;\n"); + printf("#ifdef _DLLENT_PRIVATE_\n"); + printf(" _DLLENT_PRIVATE_\n"); + printf("#endif\n"); + printf("} Dllent_t;\n"); + printf("\n"); + printf("typedef struct Dllscan_s\n"); + printf("{\n"); + printf(" void* pad;\n"); + printf("#ifdef _DLLSCAN_PRIVATE_\n"); + printf(" _DLLSCAN_PRIVATE_\n"); + printf("#endif\n"); + printf("} Dllscan_t;\n"); #if !_hdr_dlfcn || !_lib_dlopen - printf("\n"); - printf("extern void* dlopen(const char*, int);\n"); - printf("extern void* dlsym(void*, const char*);\n"); - printf("extern int dlclose(void*);\n"); - printf("extern char* dlerror(void);\n"); + printf("\n"); + printf("extern void* dlopen(const char*, int);\n"); + printf("extern void* dlsym(void*, const char*);\n"); + printf("extern int dlclose(void*);\n"); + printf("extern char* dlerror(void);\n"); #endif - printf("\n"); - printf("extern Dllinfo_t* dllinfo(void);\n"); - printf("extern void* dllplugin(const char*, const char*, const char*, unsigned long, unsigned long*, int, char*, size_t);\n"); - printf("extern void* dllplug(const char*, const char*, const char*, int, char*, size_t);\n"); - printf("extern void* dllfind(const char*, const char*, int, char*, size_t);\n"); - printf("extern Dllnames_t* dllnames(const char*, const char*, Dllnames_t*);\n"); - printf("extern void* dll_lib(Dllnames_t*, unsigned long, Dllerror_f, void*);\n"); - printf("extern void* dllmeth(const char*, const char*, unsigned long);\n"); - printf("extern void* dllopen(const char*, int);\n"); - printf("extern void* dllnext(int);\n"); - printf("extern void* dlllook(void*, const char*);\n"); - printf("extern int dllcheck(void*, const char*, unsigned long, unsigned long*);\n"); - printf("extern unsigned long dllversion(void*, const char*);\n"); - printf("extern char* dllerror(int);\n"); + printf("\n"); + printf("extern Dllinfo_t* dllinfo(void);\n"); + printf( + "extern void* dllplugin(const char*, const char*, const char*, unsigned long, " + "unsigned long*, int, char*, size_t);\n"); + printf( + "extern void* dllplug(const char*, const char*, const char*, int, char*, " + "size_t);\n"); + printf("extern void* dllfind(const char*, const char*, int, char*, size_t);\n"); + printf("extern Dllnames_t* dllnames(const char*, const char*, Dllnames_t*);\n"); + printf("extern void* dll_lib(Dllnames_t*, unsigned long, Dllerror_f, void*);\n"); + printf("extern void* dllmeth(const char*, const char*, unsigned long);\n"); + printf("extern void* dllopen(const char*, int);\n"); + printf("extern void* dllnext(int);\n"); + printf("extern void* dlllook(void*, const char*);\n"); + printf( + "extern int dllcheck(void*, const char*, unsigned long, unsigned long*);\n"); + printf("extern unsigned long dllversion(void*, const char*);\n"); + printf("extern char* dllerror(int);\n"); #if _hdr_rld_interface - if (i >= 0) - { - printf("\n"); - printf("extern void* _dll_next(int, _DLL_RLD_SYM_TYPE*);\n"); - printf("#define dllnext(f) _dll_next(f, &_DLL_RLD_SYM)\n"); - } -#endif - printf("\n"); - printf("extern Dllscan_t* dllsopen(const char*, const char*, const char*);\n"); - printf("extern Dllent_t* dllsread(Dllscan_t*);\n"); - printf("extern int dllsclose(Dllscan_t*);\n"); + if (i >= 0) { printf("\n"); -#if _hdr_rld_interface - if (i >= 0) - { - printf("\n"); - printf("extern _DLL_RLD_SYM_TYPE _DLL_RLD_SYM;\n"); - } + printf("extern void* _dll_next(int, _DLL_RLD_SYM_TYPE*);\n"); + printf("#define dllnext(f) _dll_next(f, &_DLL_RLD_SYM)\n"); + } #endif + printf("\n"); + printf("extern Dllscan_t* dllsopen(const char*, const char*, const char*);\n"); + printf("extern Dllent_t* dllsread(Dllscan_t*);\n"); + printf("extern int dllsclose(Dllscan_t*);\n"); + printf("\n"); +#if _hdr_rld_interface + if (i >= 0) { printf("\n"); - return 0; + printf("extern _DLL_RLD_SYM_TYPE _DLL_RLD_SYM;\n"); + } +#endif + printf("\n"); + return 0; } diff --git a/features/dll/dynamic.c b/features/dll/dynamic.c index 0edfae735195..20c1eff85c9a 100644 --- a/features/dll/dynamic.c +++ b/features/dll/dynamic.c @@ -1,8 +1,6 @@ -#include #include +#include extern struct link_dynamic _DYNAMIC; -int main() { - return _DYNAMIC.ld_version; -} +int main() { return _DYNAMIC.ld_version; } diff --git a/features/fts.c b/features/fts.c index e66174a6e8d5..32d3df9e9d85 100644 --- a/features/fts.c +++ b/features/fts.c @@ -1,4 +1,3 @@ #include -int main() { -} +int main() {} diff --git a/src/cmd/builtin/pty.c b/src/cmd/builtin/pty.c index 65d8c0e404ea..29236dec15ec 100644 --- a/src/cmd/builtin/pty.c +++ b/src/cmd/builtin/pty.c @@ -187,7 +187,7 @@ static char *ptymopen(int *master) { *master = fdm; #if _lib_ptsname slave = ptsname(fdm); -#else // _lib_ptsname +#else // _lib_ptsname slave = slavename(name); #endif // _lib_ptsname break; @@ -242,7 +242,7 @@ static int mkpty(int *master, int *slave) { close(*master); return -1; } -#else // _lib_grantpt && _lib_unlockpt +#else // _lib_grantpt && _lib_unlockpt if (!(sname = ptymopen(master)) || (*slave = open(sname, O_RDWR | O_CLOEXEC)) < 0) return -1; #endif // _lib_grantpt && _lib_unlockpt #ifdef I_PUSH @@ -391,18 +391,18 @@ static int match(char *pattern, char *text, int must) { } typedef struct Master_s { - Vmalloc_t *vm; // allocation region - char *ignore; // ignore master lines matching this re - char *peek; // peek buffer pointer - char *cur; // current line - char *nxt; // next line - char *end; // end of lines - char *max; // end of buf - char *buf; // current buffer - char *prompt; // peek prompt - int cursor; // cursor in buf, 0 if fresh line - int line; // prompt line number - int restore; // previous line save char + Vmalloc_t *vm; // allocation region + char *ignore; // ignore master lines matching this re + char *peek; // peek buffer pointer + char *cur; // current line + char *nxt; // next line + char *end; // end of lines + char *max; // end of buf + char *buf; // current buffer + char *prompt; // peek prompt + int cursor; // cursor in buf, 0 if fresh line + int line; // prompt line number + int restore; // previous line save char } Master_t; #define MASTER_EOF (-1) diff --git a/src/cmd/ksh93/bltins/hist.c b/src/cmd/ksh93/bltins/hist.c index b59a24cf5584..c05bb4a494ca 100644 --- a/src/cmd/ksh93/bltins/hist.c +++ b/src/cmd/ksh93/bltins/hist.c @@ -25,11 +25,11 @@ #include #include #include "builtins.h" +#include "edit.h" #include "history.h" #include "io.h" #include "name.h" #include "variables.h" -#include "edit.h" #define HIST_RECURSE 5 diff --git a/src/cmd/ksh93/bltins/typeset.c b/src/cmd/ksh93/bltins/typeset.c index 8b3c62fa7cc4..7264ec7f5f33 100644 --- a/src/cmd/ksh93/bltins/typeset.c +++ b/src/cmd/ksh93/bltins/typeset.c @@ -914,7 +914,7 @@ int b_builtin(int argc, char *argv[], Shbltin_t *context) { Shbltin_f addr; Stk_t *stkp; char *errmsg; - void *library=0; + void *library = 0; #ifdef SH_PLUGIN_VERSION unsigned long ver; int list = 0; diff --git a/src/cmd/ksh93/edit/history.c b/src/cmd/ksh93/edit/history.c index 85d81c301b92..554b9f0f0ec7 100644 --- a/src/cmd/ksh93/edit/history.c +++ b/src/cmd/ksh93/edit/history.c @@ -525,7 +525,7 @@ void hist_eof(History_t *hp) { } } else if (n >= histinit) #endif - hp->histcmds[n] = count; + hp->histcmds[n] = count; first = cp; } switch (*((unsigned char *)(cp++))) { diff --git a/src/cmd/ksh93/include/fault.h b/src/cmd/ksh93/include/fault.h index f2e773b4dd16..fdcf6958f669 100644 --- a/src/cmd/ksh93/include/fault.h +++ b/src/cmd/ksh93/include/fault.h @@ -97,17 +97,16 @@ struct checkpt { #endif }; -# if !_AST_no_spawnveg +#if !_AST_no_spawnveg #define sh_pushcontext(shp, bp, n) \ ((bp)->mode = (n), (bp)->olist = 0, (bp)->topfd = shp->topfd, (bp)->prev = shp->jmplist, \ - (bp)->vexi = ((Spawnvex_t *)shp->vexp)->cur, (bp)->err = *ERROR_CONTEXT_BASE, \ + (bp)->vexi = ((Spawnvex_t *)shp->vexp)->cur, (bp)->err = *ERROR_CONTEXT_BASE, \ shp->jmplist = (sigjmp_buf *)(&(bp)->buff)) -# else +#else #define sh_pushcontext(shp, bp, n) \ ((bp)->mode = (n), (bp)->olist = 0, (bp)->topfd = shp->topfd, (bp)->prev = shp->jmplist, \ - (bp)->err = *ERROR_CONTEXT_BASE, \ - shp->jmplist = (sigjmp_buf *)(&(bp)->buff)) + (bp)->err = *ERROR_CONTEXT_BASE, shp->jmplist = (sigjmp_buf *)(&(bp)->buff)) #endif #define sh_popcontext(shp, bp) (shp->jmplist = (bp)->prev, errorpop(&((bp)->err))) diff --git a/src/cmd/ksh93/sh/path.c b/src/cmd/ksh93/sh/path.c index 0fe188c0134c..d6c86bb6d7ae 100644 --- a/src/cmd/ksh93/sh/path.c +++ b/src/cmd/ksh93/sh/path.c @@ -301,8 +301,7 @@ static void path_checkdup(Shell_t *shp, Pathcomp_t *pp) { int flag = 0; struct stat statb; - if (stat(name, &statb) < 0 || !S_ISDIR(statb.st_mode)) - { + if (stat(name, &statb) < 0 || !S_ISDIR(statb.st_mode)) { pp->flags |= PATH_SKIP; pp->dev = *name == '/'; return; diff --git a/src/cmd/tests/cdt/tuser.c b/src/cmd/tests/cdt/tuser.c index 7c5ca7911228..aa5569e62bb2 100644 --- a/src/cmd/tests/cdt/tuser.c +++ b/src/cmd/tests/cdt/tuser.c @@ -42,11 +42,9 @@ tmain() { terror("dtuserdata() should have returned NULL"); if (dt->user->data != (void *)11) terror("user->data should be 11"); - if (dtuserdata(dt, (void *)0, 0) != (void *)11) - terror("dtuserdata() should have returned 11"); + if (dtuserdata(dt, (void *)0, 0) != (void *)11) terror("dtuserdata() should have returned 11"); - if (dtuserdata(dt, (void *)22, 1) != (void *)11) - terror("dtuserdata() should have returned 11"); + if (dtuserdata(dt, (void *)22, 1) != (void *)11) terror("dtuserdata() should have returned 11"); if (dt->user->data != (void *)22) terror("user->data should be 22"); texit(0); diff --git a/src/cmd/tests/sfio/tclose.c b/src/cmd/tests/sfio/tclose.c index 51c74e59232f..d36fd1229ff8 100644 --- a/src/cmd/tests/sfio/tclose.c +++ b/src/cmd/tests/sfio/tclose.c @@ -34,7 +34,7 @@ tmain() { int fd[2]; Sfio_t *r, *w; char *s; - void(*handler) (int); + void (*handler)(int); #define N_STR 10 alarm(10); diff --git a/src/cmd/tests/sfio/tlocale.c b/src/cmd/tests/sfio/tlocale.c index c048a58734a6..167debfbcb0e 100644 --- a/src/cmd/tests/sfio/tlocale.c +++ b/src/cmd/tests/sfio/tlocale.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "config_ast.h" // IWYU pragma: keep -#include "sftest.h" #include +#include "sftest.h" tmain() { char buf[128], cmp[128]; diff --git a/src/cmd/tests/sfio/tpopen.c b/src/cmd/tests/sfio/tpopen.c index cb181bc182e0..faeb146e711d 100644 --- a/src/cmd/tests/sfio/tpopen.c +++ b/src/cmd/tests/sfio/tpopen.c @@ -25,7 +25,7 @@ tmain() { Sfio_t *f; char *s, *endos, *os = "one\ntwo\nthree\n"; int n; - void(*handler) (int); + void (*handler)(int); if (argc > 1) { sfmove(sfstdin, sfstdout, (Sfoff_t)(-1), -1); diff --git a/src/cmd/tests/terror.h b/src/cmd/tests/terror.h index 610c235809c2..83a97dfe7ce8 100644 --- a/src/cmd/tests/terror.h +++ b/src/cmd/tests/terror.h @@ -60,7 +60,7 @@ extern int alarm(int); extern int sleep(int); extern int fork(); extern int access(const char *, int); -extern int write (int, const void *, int); +extern int write(int, const void *, int); extern int unlink(const char *); extern void *sbrk(int); extern int getpid(); diff --git a/src/cmd/tests/vmalloc/tperform.c b/src/cmd/tests/vmalloc/tperform.c index 3957f2370f77..8dc824d5941c 100644 --- a/src/cmd/tests/vmalloc/tperform.c +++ b/src/cmd/tests/vmalloc/tperform.c @@ -91,7 +91,7 @@ static size_t Largere = 80; /* probability of being reallocated */ static size_t Empperiod = 1000; /* period to make emphemeral threads */ static size_t Empcount = 1000; /* #allocations on each invovation */ -static void **Emp; /* shared array of allocated blocks */ +static void **Emp; /* shared array of allocated blocks */ /* accounting for space usage */ static size_t Maxbusy = 0; /* size of max busy space at any time */ diff --git a/src/cmd/tests/vmalloc/trandom.c b/src/cmd/tests/vmalloc/trandom.c index cf7cb5873e94..1a173b1a48f7 100644 --- a/src/cmd/tests/vmalloc/trandom.c +++ b/src/cmd/tests/vmalloc/trandom.c @@ -25,7 +25,7 @@ typedef struct _obj_s Obj_t; struct _obj_s { - void *obj; /* allocated object */ + void *obj; /* allocated object */ size_t size; /* its allocated size */ Obj_t *next; /* linked list pointer */ }; diff --git a/src/cmd/tests/vmalloc/tsafemalloc.c b/src/cmd/tests/vmalloc/tsafemalloc.c index 785e2cdcbe40..cc0a5f1f164e 100644 --- a/src/cmd/tests/vmalloc/tsafemalloc.c +++ b/src/cmd/tests/vmalloc/tsafemalloc.c @@ -40,7 +40,7 @@ static size_t Largelf = 1000; /* life of an allocated piece */ static size_t Empperiod = 0; /* period to make emphemeral threads */ static size_t Empcount = 100; /* #allocations on each invovation */ -static void **Emp; /* array of allocated blocks */ +static void **Emp; /* array of allocated blocks */ static size_t Maxbusy = 0; /* size of max busy space at any time */ static size_t Curbusy = 0; /* size of busy space at current time */ diff --git a/src/cmd/tests/vmalloc/tsegwalk.c b/src/cmd/tests/vmalloc/tsegwalk.c index 925fe8e56eca..b73d61993e3e 100644 --- a/src/cmd/tests/vmalloc/tsegwalk.c +++ b/src/cmd/tests/vmalloc/tsegwalk.c @@ -33,8 +33,7 @@ static Vmuchar_t *Buf, *Endbuf, *Avail; static int Count = 0; static int Walk = 0; -static void *memory(Vmalloc_t *vm, void *caddr, size_t oldsize, size_t newsize, - Vmdisc_t *disc) { +static void *memory(Vmalloc_t *vm, void *caddr, size_t oldsize, size_t newsize, Vmdisc_t *disc) { if (!Avail) { Avail = Buf = (Vmuchar_t *)(&Algn[0]); Endbuf = Buf + sizeof(Algn); diff --git a/src/cmd/tests/vmalloc/tsharemem.c b/src/cmd/tests/vmalloc/tsharemem.c index 7bcb5cc115b5..ac6b684f7125 100644 --- a/src/cmd/tests/vmalloc/tsharemem.c +++ b/src/cmd/tests/vmalloc/tsharemem.c @@ -32,9 +32,9 @@ #define N_FREE (2 * 1024) /* #frees <= #allocations */ typedef struct _piece_s { - void *addr; /* allocated address */ - size_t size; /* size to be allocated */ - int free; /* 1: to be freed */ + void *addr; /* allocated address */ + size_t size; /* size to be allocated */ + int free; /* 1: to be freed */ } Piece_t; Piece_t Piece[N_ALLOC]; diff --git a/src/cmd/tests/vmalloc/tsharesimple.c b/src/cmd/tests/vmalloc/tsharesimple.c index 7bcb5cc115b5..ac6b684f7125 100644 --- a/src/cmd/tests/vmalloc/tsharesimple.c +++ b/src/cmd/tests/vmalloc/tsharesimple.c @@ -32,9 +32,9 @@ #define N_FREE (2 * 1024) /* #frees <= #allocations */ typedef struct _piece_s { - void *addr; /* allocated address */ - size_t size; /* size to be allocated */ - int free; /* 1: to be freed */ + void *addr; /* allocated address */ + size_t size; /* size to be allocated */ + int free; /* 1: to be freed */ } Piece_t; Piece_t Piece[N_ALLOC]; diff --git a/src/cmd/tests/vmalloc/tsinglemem.c b/src/cmd/tests/vmalloc/tsinglemem.c index 7c40147a3319..bda50eb7b181 100644 --- a/src/cmd/tests/vmalloc/tsinglemem.c +++ b/src/cmd/tests/vmalloc/tsinglemem.c @@ -31,9 +31,9 @@ #define N_FREE (256) /* #frees <= #allocs */ typedef struct _piece_s { - void *addr; /* allocated address */ - size_t size; /* size to be allocated */ - int free; /* 1: to be freed */ + void *addr; /* allocated address */ + size_t size; /* size to be allocated */ + int free; /* 1: to be freed */ } Piece_t; Piece_t Piece[N_ALLOC]; diff --git a/src/lib/libast/cdt/cdtlib.h b/src/lib/libast/cdt/cdtlib.h index 91e6e6ae7768..a07901e0a3c3 100644 --- a/src/lib/libast/cdt/cdtlib.h +++ b/src/lib/libast/cdt/cdtlib.h @@ -74,7 +74,7 @@ typedef struct _dtlib_s { #if _BLD_cdt -#define CDTLIB(m) Dtmethod_t * m = &_##m; +#define CDTLIB(m) Dtmethod_t *m = &_##m; #else diff --git a/src/lib/libast/cdt/dtcomp.c b/src/lib/libast/cdt/dtcomp.c index ec556247a17f..27c8eeb50e8d 100644 --- a/src/lib/libast/cdt/dtcomp.c +++ b/src/lib/libast/cdt/dtcomp.c @@ -42,6 +42,4 @@ Dtlink_t *dtrestore(Dt_t *d, void *l) { } #undef dtsize -ssize_t dtsize(Dt_t *d) { - return (ssize_t)(*(_DT(d)->searchf))((d), (void *)(0), DT_STAT); -} +ssize_t dtsize(Dt_t *d) { return (ssize_t)(*(_DT(d)->searchf))((d), (void *)(0), DT_STAT); } diff --git a/src/lib/libast/cdt/dtmethod.c b/src/lib/libast/cdt/dtmethod.c index 748b1fca8872..1b843058981c 100644 --- a/src/lib/libast/cdt/dtmethod.c +++ b/src/lib/libast/cdt/dtmethod.c @@ -85,8 +85,7 @@ int dtcustomize(Dt_t *dt, int type, int action) { } if ((type & DT_ANNOUNCE) && - (!dt->meth->eventf || - (*dt->meth->eventf)(dt, DT_ANNOUNCE, (void *)((long)action)) >= 0)) { + (!dt->meth->eventf || (*dt->meth->eventf)(dt, DT_ANNOUNCE, (void *)((long)action)) >= 0)) { if (action <= 0) dt->data->type &= ~DT_ANNOUNCE; else diff --git a/src/lib/libast/cdt/dtrehash.c b/src/lib/libast/cdt/dtrehash.c index 8e37393b629a..af35ad3ba6aa 100644 --- a/src/lib/libast/cdt/dtrehash.c +++ b/src/lib/libast/cdt/dtrehash.c @@ -213,7 +213,7 @@ static void *hclear(Dt_t *dt, Htbl_t *tbl, ssize_t lev, int zap) { /* this constitutes the core of dtfirst() and dtlast() */ static void *hfirst(Dt_t *dt, Fngr_t *fngr, Htbl_t *tbl, ssize_t lev, ssize_t pos, uint hsh, - int type) { + int type) { ssize_t tblz; void *obj; Dtlink_t *t, *p; @@ -254,7 +254,7 @@ static void *hfirst(Dt_t *dt, Fngr_t *fngr, Htbl_t *tbl, ssize_t lev, ssize_t po /* this constitutes the core of dtnext() and dtprev() */ static void *hnext(Dt_t *dt, Fngr_t *fngr, Htbl_t *tbl, ssize_t lev, ssize_t pos, uint hsh, - int type) { + int type) { Dtlink_t *t; void *obj; @@ -277,7 +277,7 @@ static void *hnext(Dt_t *dt, Fngr_t *fngr, Htbl_t *tbl, ssize_t lev, ssize_t pos /* construct a flat list of objects */ static void *hflatten(Dt_t *dt, Dtlink_t **list, Dtlink_t *last, Htbl_t *tbl, ssize_t lev, - int zap) { + int zap) { ssize_t tblz, p; Dtlink_t *t, **lnkp; Hash_t *hash = (Hash_t *)dt->data; diff --git a/src/lib/libast/comp/iconv.c b/src/lib/libast/comp/iconv.c index dd055e502115..57456160d2ca 100644 --- a/src/lib/libast/comp/iconv.c +++ b/src/lib/libast/comp/iconv.c @@ -838,7 +838,8 @@ _ast_iconv_t _ast_iconv_open(const char *t, const char *f) { * 8 bit maps are the easiest */ - if (fc >= 0 && tc >= 0) cc->from.map = ccmap(fc, tc); + if (fc >= 0 && tc >= 0) + cc->from.map = ccmap(fc, tc); else if ((cc->cvt = iconv_open(t, f)) != (iconv_t)(-1) || (cc->cvt = iconv_open(to, fr)) != (iconv_t)(-1)) cc->from.fun = (_ast_iconv_f)iconv; diff --git a/src/lib/libast/include/ast.h b/src/lib/libast/include/ast.h index 1d4d9f4c65cd..fdffa50ace94 100644 --- a/src/lib/libast/include/ast.h +++ b/src/lib/libast/include/ast.h @@ -51,10 +51,10 @@ #define EXIT_BITS 8 /* # exit status bits */ -#define EXIT_USAGE 2 /* usage exit code */ -#define EXIT_QUIT 255 /* parent should quit */ -#define EXIT_NOTFOUND 127 /* command not found */ -#define EXIT_NOEXEC 126 /* other exec error */ +#define EXIT_USAGE 2 /* usage exit code */ +#define EXIT_QUIT 255 /* parent should quit */ +#define EXIT_NOTFOUND 127 /* command not found */ +#define EXIT_NOEXEC 126 /* other exec error */ #define EXIT_CODE(x) ((x) & ((1 << EXIT_BITS) - 1)) #define EXIT_CORE(x) (EXIT_CODE(x) | (1 << EXIT_BITS) | (1 << (EXIT_BITS - 1))) diff --git a/src/lib/libast/include/ast_common.h b/src/lib/libast/include/ast_common.h index e300d392d275..9204d34e5abd 100644 --- a/src/lib/libast/include/ast_common.h +++ b/src/lib/libast/include/ast_common.h @@ -21,8 +21,8 @@ #if _hdr_stddef #include #endif -#include #include +#include #endif #endif diff --git a/src/lib/libast/include/cdt.h b/src/lib/libast/include/cdt.h index dc0b09dc3b7c..908ce94530f0 100644 --- a/src/lib/libast/include/cdt.h +++ b/src/lib/libast/include/cdt.h @@ -67,17 +67,17 @@ typedef struct _dt_s Dt_t; typedef struct _dtstat_s Dtstat_t; typedef void *(*Dtsearch_f)(Dt_t *, void *, int); typedef void *(*Dtmake_f)(Dt_t *, void *, Dtdisc_t *); -typedef void(*Dtfree_f) (Dt_t *, void *, Dtdisc_t *); -typedef int(*Dtcompar_f)(Dt_t *, void *, void *, Dtdisc_t *); -typedef unsigned int(*Dthash_f)(Dt_t *, void *, Dtdisc_t *); +typedef void (*Dtfree_f)(Dt_t *, void *, Dtdisc_t *); +typedef int (*Dtcompar_f)(Dt_t *, void *, void *, Dtdisc_t *); +typedef unsigned int (*Dthash_f)(Dt_t *, void *, Dtdisc_t *); typedef void *(*Dtmemory_f)(Dt_t *, void *, size_t, Dtdisc_t *); -typedef int(*Dtevent_f)(Dt_t *, int, void *, Dtdisc_t *); -typedef int(*Dttype_f)(Dt_t *, int); +typedef int (*Dtevent_f)(Dt_t *, int, void *, Dtdisc_t *); +typedef int (*Dttype_f)(Dt_t *, int); struct _dtuser_s /* for application to access and use */ { unsigned int lock; /* used by dtapplock */ - void *data; /* for whatever data */ + void *data; /* for whatever data */ }; struct _dtlink_s { @@ -102,14 +102,14 @@ struct _dtlink_s { /* private structure to hold an object */ struct _dthold_s { Dtlink_t hdr; /* header to hold obj */ - void *obj; /* application object */ + void *obj; /* application object */ }; /* method to manipulate dictionary structure */ struct _dtmethod_s { Dtsearch_f searchf; /* search function */ unsigned int type; /* type of operation */ - int(*eventf)(Dt_t *, int, void *); + int (*eventf)(Dt_t *, int, void *); char *name; /* name of method */ char *description; /* description */ }; @@ -262,7 +262,7 @@ extern Dtmethod_t *Dtrhbag; extern Dt_t *dtopen(Dtdisc_t *, Dtmethod_t *); extern int dtclose(Dt_t *); extern Dt_t *dtview(Dt_t *, Dt_t *); -extern Dtdisc_t *dtdisc(Dt_t * dt, Dtdisc_t *, int); +extern Dtdisc_t *dtdisc(Dt_t *dt, Dtdisc_t *, int); extern Dtmethod_t *dtmethod(Dt_t *, Dtmethod_t *); extern int dtwalk(Dt_t *, int (*)(Dt_t *, void *, void *), void *); extern int dtcustomize(Dt_t *, int, int); @@ -293,8 +293,8 @@ extern void *dllmeth(const char *, const char *, unsigned long); #define _DTK(dc, o) ((char *)(o) + (dc)->key) /* get key from object */ #define _DTKEY(dc, o) (void *)((dc)->size >= 0 ? _DTK(dc, o) : *((char **)_DTK(dc, o))) -#define _DTCMP(dt, k1, k2, dc) \ - ((dc)->comparf ? (*(dc)->comparf)((dt), (k1), (k2), (dc)) \ +#define _DTCMP(dt, k1, k2, dc) \ + ((dc)->comparf ? (*(dc)->comparf)((dt), (k1), (k2), (dc)) \ : (dc)->size > 0 ? memcmp((void *)(k1), ((void *)k2), (dc)->size) \ : strcmp((char *)(k1), ((char *)k2))) diff --git a/src/lib/libast/include/sfio.h b/src/lib/libast/include/sfio.h index 789267ea0ba6..0550fc59d7a6 100644 --- a/src/lib/libast/include/sfio.h +++ b/src/lib/libast/include/sfio.h @@ -44,11 +44,11 @@ typedef struct _sfdisc_s Sfdisc_t; #define Sfulong_t uint64_t #define Sfdouble_t _ast_fltmax_t -typedef ssize_t(*Sfread_f)(Sfio_t *, void *, size_t, Sfdisc_t *); -typedef ssize_t(*Sfwrite_f)(Sfio_t *, const void *, size_t, Sfdisc_t *); -typedef Sfoff_t(*Sfseek_f)(Sfio_t *, Sfoff_t, int, Sfdisc_t *); -typedef int(*Sfexcept_f)(Sfio_t *, int, void *, Sfdisc_t *); -typedef int(*Sfwalk_f)(Sfio_t *, void *); +typedef ssize_t (*Sfread_f)(Sfio_t *, void *, size_t, Sfdisc_t *); +typedef ssize_t (*Sfwrite_f)(Sfio_t *, const void *, size_t, Sfdisc_t *); +typedef Sfoff_t (*Sfseek_f)(Sfio_t *, Sfoff_t, int, Sfdisc_t *); +typedef int (*Sfexcept_f)(Sfio_t *, int, void *, Sfdisc_t *); +typedef int (*Sfwalk_f)(Sfio_t *, void *); /* discipline structure */ struct _sfdisc_s { @@ -63,8 +63,8 @@ struct _sfdisc_s { /* formatting environment */ typedef struct _sffmt_s Sffmt_t; -typedef int(*Sffmtext_f)(Sfio_t *, void *, Sffmt_t *); -typedef int(*Sffmtevent_f)(Sfio_t *, int, void *, Sffmt_t *); +typedef int (*Sffmtext_f)(Sfio_t *, void *, Sffmt_t *); +typedef int (*Sffmtevent_f)(Sfio_t *, int, void *, Sffmt_t *); struct _sffmt_s { long version; /* version of this structure */ Sffmtext_f extf; /* function to process arguments */ diff --git a/src/lib/libast/include/sfio_t.h b/src/lib/libast/include/sfio_t.h index c891af0147f7..5f7b5652e956 100644 --- a/src/lib/libast/include/sfio_t.h +++ b/src/lib/libast/include/sfio_t.h @@ -42,8 +42,8 @@ struct _sfpool_s *pool; /* the pool containing this */ \ struct _sfrsrv_s *rsrv; /* reserved buffer */ \ struct _sfproc_s *proc; /* coprocess id, etc. */ \ - void *mutex; /* mutex for thread-safety */ \ - void *stdio; /* stdio FILE if any */ \ + void *mutex; /* mutex for thread-safety */ \ + void *stdio; /* stdio FILE if any */ \ Sfoff_t lpos; /* last seek position */ \ size_t iosz; /* preferred size for I/O */ \ size_t blksz; /* preferred block size */ \ @@ -92,7 +92,7 @@ (struct _sfrsrv_s *)0, /* rsrv */ \ (struct _sfproc_s *)0, /* proc */ \ (mutex), /* mutex */ \ - (void *)0, /* stdio */ \ + (void *)0, /* stdio */ \ (Sfoff_t)0, /* lpos */ \ (size_t)0, /* iosz */ \ 0, /* blksz */ \ @@ -122,7 +122,7 @@ (f)->rsrv = (struct _sfrsrv_s *)0, /* rsrv */ \ (f)->proc = (struct _sfproc_s *)0, /* proc */ \ (f)->mutex = (mtx), /* mutex */ \ - (f)->stdio = (void *)0, /* stdio */ \ + (f)->stdio = (void *)0, /* stdio */ \ (f)->lpos = (Sfoff_t)0, /* lpos */ \ (f)->iosz = (size_t)0, /* iosz */ \ (f)->blksz = 0, /* blksz */ \ diff --git a/src/lib/libast/include/vmalloc.h b/src/lib/libast/include/vmalloc.h index d02344d91804..fbc498c9a2d9 100644 --- a/src/lib/libast/include/vmalloc.h +++ b/src/lib/libast/include/vmalloc.h @@ -41,8 +41,8 @@ typedef struct Vmdisc_s Vmdisc_t; typedef struct Vmethod_s Vmethod_t; typedef struct Vmdata_s Vmdata_t; typedef void *(*Vmemory_f)(Vmalloc_t *, void *, size_t, size_t, Vmdisc_t *); -typedef int(*Vmexcept_f)(Vmalloc_t *, int, void *, Vmdisc_t *); -typedef int(*Vmseg_f)(Vmalloc_t *, void *, size_t, Vmdisc_t *, void *); +typedef int (*Vmexcept_f)(Vmalloc_t *, int, void *, Vmdisc_t *); +typedef int (*Vmseg_f)(Vmalloc_t *, void *, size_t, Vmdisc_t *, void *); struct Vmstat_s { size_t n_busy; /* number of busy blocks */ @@ -68,10 +68,10 @@ struct Vmdisc_s { struct Vmethod_s { void *(*allocf)(Vmalloc_t *, size_t, int); void *(*resizef)(Vmalloc_t *, void *, size_t, int, int); - int(*freef)(Vmalloc_t *, void *, int); - int(*nopf)(Vmalloc_t *, void *, int); /* was addrf -- binary compatibility filler */ - int(*statf)(Vmalloc_t *, Vmstat_t *, int); /* was sizef */ - int(*eventf)(Vmalloc_t *, int, void *); /* was compactf */ + int (*freef)(Vmalloc_t *, void *, int); + int (*nopf)(Vmalloc_t *, void *, int); /* was addrf -- binary compatibility filler */ + int (*statf)(Vmalloc_t *, Vmstat_t *, int); /* was sizef */ + int (*eventf)(Vmalloc_t *, int, void *); /* was compactf */ void *(*alignf)(Vmalloc_t *, size_t, size_t, int); unsigned int meth; }; @@ -119,10 +119,10 @@ struct Vmalloc_s { #define VM_CHECKARENA 101 /* checking arena integrity */ #define VM_BLOCKHEAD 102 /* get size of extra head */ -extern Vmethod_t *Vmbest; /* best allocation */ -extern Vmethod_t *Vmlast; /* last-block allocation */ -extern Vmethod_t *Vmpool; /* pool allocation */ -extern Vmethod_t *Vmdebug; /* allocation with debugging */ +extern Vmethod_t *Vmbest; /* best allocation */ +extern Vmethod_t *Vmlast; /* last-block allocation */ +extern Vmethod_t *Vmpool; /* pool allocation */ +extern Vmethod_t *Vmdebug; /* allocation with debugging */ extern Vmdisc_t *Vmdcsystem; /* get memory from the OS */ extern Vmdisc_t *Vmdcheap; /* get memory from Vmheap */ diff --git a/src/lib/libast/misc/fts.c b/src/lib/libast/misc/fts.c index 133d99c7cdd6..4ef85e398ebc 100644 --- a/src/lib/libast/misc/fts.c +++ b/src/lib/libast/misc/fts.c @@ -1,24 +1,24 @@ /*********************************************************************** -* * -* This software is part of the ast package * -* Copyright (c) 1985-2011 AT&T Intellectual Property * -* and is licensed under the * -* Eclipse Public License, Version 1.0 * -* by AT&T Intellectual Property * -* * -* A copy of the License is available at * -* http://www.eclipse.org/org/documents/epl-v10.html * -* (with md5 checksum b35adb5213ca9657e911e9befb180842) * -* * -* Information and Software Systems Research * -* AT&T Research * -* Florham Park NJ * -* * -* Glenn Fowler * -* David Korn * -* Phong Vo * -* * -***********************************************************************/ + * * + * This software is part of the ast package * + * Copyright (c) 1985-2011 AT&T Intellectual Property * + * and is licensed under the * + * Eclipse Public License, Version 1.0 * + * by AT&T Intellectual Property * + * * + * A copy of the License is available at * + * http://www.eclipse.org/org/documents/epl-v10.html * + * (with md5 checksum b35adb5213ca9657e911e9befb180842) * + * * + * Information and Software Systems Research * + * AT&T Research * + * Florham Park NJ * + * * + * Glenn Fowler * + * David Korn * + * Phong Vo * + * * + ***********************************************************************/ #pragma prototyped /* * Phong Vo @@ -38,15 +38,11 @@ * conditioned by astconf() */ -int -fts_flags(void) -{ - char* s; +int fts_flags(void) { + char *s; s = astconf("PATH_RESOLVE", 0, 0); - if (streq(s, "logical")) - return FTS_LOGICAL; - if (streq(s, "physical")) - return FTS_PHYSICAL|FTS_SEEDOT; - return FTS_COMFOLLOW|FTS_PHYSICAL|FTS_SEEDOT; + if (streq(s, "logical")) return FTS_LOGICAL; + if (streq(s, "physical")) return FTS_PHYSICAL | FTS_SEEDOT; + return FTS_COMFOLLOW | FTS_PHYSICAL | FTS_SEEDOT; } diff --git a/src/lib/libast/misc/procopen.c b/src/lib/libast/misc/procopen.c index 7a4a498553c5..d329c0e57fea 100644 --- a/src/lib/libast/misc/procopen.c +++ b/src/lib/libast/misc/procopen.c @@ -34,8 +34,8 @@ #include "proclib.h" #include -#include #include +#include /* * not quite ready for _use_spawnveg */ diff --git a/src/lib/libast/misc/spawnvex.c b/src/lib/libast/misc/spawnvex.c index 52234ec636fd..c62462cfa5db 100644 --- a/src/lib/libast/misc/spawnvex.c +++ b/src/lib/libast/misc/spawnvex.c @@ -139,7 +139,8 @@ static pid_t spawn(const char *path, int nmap, const int map[], const struct inh break; } if (m) { - while (waitpid(pid, &n, 0) && errno == EINTR); + while (waitpid(pid, &n, 0) && errno == EINTR) + ; pid = -1; n = m; } @@ -212,7 +213,8 @@ static pid_t spawnve(int mode, const char *path, char *const argv[], char *const break; } if (m) { - while (waitpid(pid, &n, 0) && errno == EINTR); + while (waitpid(pid, &n, 0) && errno == EINTR) + ; pid = -1; n = m; } diff --git a/src/lib/libast/path/pathcanon.c b/src/lib/libast/path/pathcanon.c index 50dbc44c9602..fb98522a94c0 100644 --- a/src/lib/libast/path/pathcanon.c +++ b/src/lib/libast/path/pathcanon.c @@ -548,14 +548,12 @@ char *pathdev(int dfd, const char *path, char *canon, size_t size, int flags, Pa } else #endif if ((t - 5) >= r) { - for (t -= 5; t > r && *(t - 1) != '/'; t--) { - ; // empty loop - } + for (t -= 5; t > r && *(t - 1) != '/'; t--) { + ; // empty loop } - else if ((t - 4) == r) { + } else if ((t - 4) == r) { t = r + 1; - } - else + } else r = t; break; case 3: diff --git a/src/lib/libast/regex/regexec.c b/src/lib/libast/regex/regexec.c index 17e040eb0a84..d99c15e283d9 100644 --- a/src/lib/libast/regex/regexec.c +++ b/src/lib/libast/regex/regexec.c @@ -59,7 +59,7 @@ int regexec_20120528(const regex_t *p, const char *s, size_t nmatch, regmatch_t #endif int regexec(const regex_t *p, const char *s, size_t nmatch, oldregmatch_t *oldmatch, - regflags_t flags) { + regflags_t flags) { if (oldmatch) { regmatch_t *match; size_t i; diff --git a/src/lib/libast/regex/regnexec.c b/src/lib/libast/regex/regnexec.c index 80ff51bc0f97..be4a71ccf1f9 100644 --- a/src/lib/libast/regex/regnexec.c +++ b/src/lib/libast/regex/regnexec.c @@ -1842,8 +1842,8 @@ void regfree(regex_t *p) { #define regnexec _ast_regnexec #endif -int regnexec(const regex_t *p, const char *s, size_t len, size_t nmatch, - oldregmatch_t *oldmatch, regflags_t flags) { +int regnexec(const regex_t *p, const char *s, size_t len, size_t nmatch, oldregmatch_t *oldmatch, + regflags_t flags) { if (oldmatch) { regmatch_t *match; ssize_t i; diff --git a/src/lib/libast/regex/regrexec.c b/src/lib/libast/regex/regrexec.c index 26edb514f180..31580f411357 100644 --- a/src/lib/libast/regex/regrexec.c +++ b/src/lib/libast/regex/regrexec.c @@ -131,9 +131,8 @@ int regrexec_20120528(const regex_t *p, const char *s, size_t len, size_t nmatch #define regrexec _ast_regrexec #endif -int regrexec(const regex_t *p, const char *s, size_t len, size_t nmatch, - oldregmatch_t *oldmatch, regflags_t flags, int sep, void *handle, - regrecord_t record) { +int regrexec(const regex_t *p, const char *s, size_t len, size_t nmatch, oldregmatch_t *oldmatch, + regflags_t flags, int sep, void *handle, regrecord_t record) { if (oldmatch) { regmatch_t *match; ssize_t i; diff --git a/src/lib/libast/sfio/sfhdr.h b/src/lib/libast/sfio/sfhdr.h index 54dfa976c66e..3c6b2a88501b 100644 --- a/src/lib/libast/sfio/sfhdr.h +++ b/src/lib/libast/sfio/sfhdr.h @@ -267,16 +267,16 @@ #if vt_threaded #define SFMTXdecl(ff, _mf_) Sfio_t *_mf_ = (ff) -#define SFMTXbegin(ff, _mf_, rv) \ - { \ - if ((ff)->_flags & SF_MTSAFE) { \ - (_mf_) = (ff); \ - if (sfmutex((ff), SFMTX_LOCK) != 0) return (rv); \ - if (_Sfnotify) { \ +#define SFMTXbegin(ff, _mf_, rv) \ + { \ + if ((ff)->_flags & SF_MTSAFE) { \ + (_mf_) = (ff); \ + if (sfmutex((ff), SFMTX_LOCK) != 0) return (rv); \ + if (_Sfnotify) { \ (*_Sfnotify)((_mf_), SF_MTACCESS, (void *)(&(ff))); \ - if (!(ff)) (ff) = (_mf_); \ - } \ - } \ + if (!(ff)) (ff) = (_mf_); \ + } \ + } \ } #define SFMTXend(ff, _mf_) \ { \ @@ -692,7 +692,7 @@ struct _fmtpos_s { /* _Sftest SF_TEST_* bitmasks -- 0x0001..0x0080 are unnamed */ /* local variables used across sf-functions */ -typedef void(*Sfnotify_f)(Sfio_t *, int, void *); +typedef void (*Sfnotify_f)(Sfio_t *, int, void *); #define _Sfpage (_Sfextern.sf_page) #define _Sfpool (_Sfextern.sf_pool) #define _Sfpmove (_Sfextern.sf_pmove) @@ -711,16 +711,16 @@ typedef void(*Sfnotify_f)(Sfio_t *, int, void *); typedef struct _sfextern_s { ssize_t sf_page; struct _sfpool_s sf_pool; - int(*sf_pmove)(Sfio_t *, int); + int (*sf_pmove)(Sfio_t *, int); Sfio_t *(*sf_stack)(Sfio_t *, Sfio_t *); - void(*sf_notify)(Sfio_t *, int, void *); - int(*sf_stdsync)(Sfio_t *); + void (*sf_notify)(Sfio_t *, int, void *); + int (*sf_stdsync)(Sfio_t *); struct _sfdisc_s sf_udisc; - void(*sf_cleanup)(void); + void (*sf_cleanup)(void); int sf_exiting; int sf_done; Vtonce_t *sf_once; - void(*sf_oncef)(void); + void (*sf_oncef)(void); Vtmutex_t *sf_mutex; size_t sf_maxm; unsigned long sf_test; @@ -1091,48 +1091,48 @@ typedef struct _sftab_ { #endif /*_PACKAGE_ast*/ /* note that MEMCPY advances the associated pointers */ -#define MEMCPY(to, fr, n) \ - switch (n) { \ - default: \ +#define MEMCPY(to, fr, n) \ + switch (n) { \ + default: \ memcpy((void *)to, (void *)fr, n); \ - to += n; \ - fr += n; \ - break; \ - case 7: \ - *to++ = *fr++; \ - case 6: \ - *to++ = *fr++; \ - case 5: \ - *to++ = *fr++; \ - case 4: \ - *to++ = *fr++; \ - case 3: \ - *to++ = *fr++; \ - case 2: \ - *to++ = *fr++; \ - case 1: \ - *to++ = *fr++; \ + to += n; \ + fr += n; \ + break; \ + case 7: \ + *to++ = *fr++; \ + case 6: \ + *to++ = *fr++; \ + case 5: \ + *to++ = *fr++; \ + case 4: \ + *to++ = *fr++; \ + case 3: \ + *to++ = *fr++; \ + case 2: \ + *to++ = *fr++; \ + case 1: \ + *to++ = *fr++; \ } -#define MEMSET(s, c, n) \ - switch (n) { \ - default: \ +#define MEMSET(s, c, n) \ + switch (n) { \ + default: \ memset((void *)s, (int)c, n); \ - s += n; \ - break; \ - case 7: \ - *s++ = c; \ - case 6: \ - *s++ = c; \ - case 5: \ - *s++ = c; \ - case 4: \ - *s++ = c; \ - case 3: \ - *s++ = c; \ - case 2: \ - *s++ = c; \ - case 1: \ - *s++ = c; \ + s += n; \ + break; \ + case 7: \ + *s++ = c; \ + case 6: \ + *s++ = c; \ + case 5: \ + *s++ = c; \ + case 4: \ + *s++ = c; \ + case 3: \ + *s++ = c; \ + case 2: \ + *s++ = c; \ + case 1: \ + *s++ = c; \ } extern Sftab_t _Sftable; @@ -1175,7 +1175,7 @@ extern void bzero(void *, size_t); extern time_t time(time_t *); extern int waitpid(int, int *, int); extern void _exit(int); -typedef int(*Onexit_f)(void); +typedef int (*Onexit_f)(void); extern Onexit_f onexit(Onexit_f); extern int poll(struct pollfd *, ulong, int); diff --git a/src/lib/libast/sfio/sfmode.c b/src/lib/libast/sfio/sfmode.c index 799a72135ab1..68ec915b9d5a 100644 --- a/src/lib/libast/sfio/sfmode.c +++ b/src/lib/libast/sfio/sfmode.c @@ -58,7 +58,7 @@ static char *Version = "\n@(#)$Id: sfio (AT&T Labs - Research) 2009-09-15 $\0\n" #define Sfsignal_f Sig_handler_t #else #include -typedef void(*Sfsignal_f)(int); +typedef void (*Sfsignal_f)(int); #endif static int _Sfsigp = 0; /* # of streams needing SIGPIPE protection */ diff --git a/src/lib/libast/sfio/sfsetbuf.c b/src/lib/libast/sfio/sfsetbuf.c index 0efb12b86051..41f4d53c54b5 100644 --- a/src/lib/libast/sfio/sfsetbuf.c +++ b/src/lib/libast/sfio/sfsetbuf.c @@ -30,13 +30,13 @@ __STDPP__directive pragma pp : hide getpagesize #include "sfhdr.h" #if defined(__STDPP__directive) && defined(__STDPP__hide) - __STDPP__directive pragma pp - : nohide getpagesize + __STDPP__directive pragma pp : nohide getpagesize #else #undef getpagesize #endif -extern int getpagesize(void); + extern int + getpagesize(void); /* Set a (new) buffer for a stream. ** If size < 0, it is assigned a suitable value depending on the diff --git a/src/lib/libast/sfio/sfstrtof.h b/src/lib/libast/sfio/sfstrtof.h index ac2227581c8e..66e81682db79 100644 --- a/src/lib/libast/sfio/sfstrtof.h +++ b/src/lib/libast/sfio/sfstrtof.h @@ -119,7 +119,7 @@ #if S2F_scan -typedef int(*S2F_get_f)(void *, int); +typedef int (*S2F_get_f)(void *, int); #define ERR(e) #define GET(p) (*get)(p, 0) @@ -164,7 +164,7 @@ static S2F_function(void *s, S2F_get_f get) #else #if S2F_size - S2F_function(const char *str, size_t size, char **end) +S2F_function(const char *str, size_t size, char **end) #else S2F_function(const char *str, char **end) #endif diff --git a/src/lib/libast/sfio/sfvprintf.c b/src/lib/libast/sfio/sfvprintf.c index cdbf5b7d279e..d645e2f3504b 100644 --- a/src/lib/libast/sfio/sfvprintf.c +++ b/src/lib/libast/sfio/sfvprintf.c @@ -163,13 +163,13 @@ int sfvprintf(Sfio_t *f, const char *form, va_list args) { goto done; \ } \ } -#define SMwrite(f, s, n) \ - { \ +#define SMwrite(f, s, n) \ + { \ if ((o = SFWRITE(f, (void *)s, n)) > 0) n_output += o; \ - if (o != n) { \ - SFBUF(f); \ - goto done; \ - } \ + if (o != n) { \ + SFBUF(f); \ + goto done; \ + } \ } #if _sffmt_small /* these macros are made smaller at some performance cost */ #define SFBUF(f) diff --git a/src/lib/libast/sfio/vthread.h b/src/lib/libast/sfio/vthread.h index a931fedefeea..8c5d4ec65a83 100644 --- a/src/lib/libast/sfio/vthread.h +++ b/src/lib/libast/sfio/vthread.h @@ -143,7 +143,7 @@ struct _vthread_s { size_t stack; /* stack size */ int state; /* execution state */ int error; /* error status */ - void *exit; /* exit value */ + void *exit; /* exit value */ }; /* structure for exactly once execution */ diff --git a/src/lib/libast/tm/tmxfmt.c b/src/lib/libast/tm/tmxfmt.c index f6a8259ebb84..c7484365678c 100644 --- a/src/lib/libast/tm/tmxfmt.c +++ b/src/lib/libast/tm/tmxfmt.c @@ -27,7 +27,6 @@ */ #include "config_ast.h" // IWYU pragma: keep - #include #include diff --git a/src/lib/libast/vmalloc/malloc.c b/src/lib/libast/vmalloc/malloc.c index 2cddf7647411..08ba81e1310e 100644 --- a/src/lib/libast/vmalloc/malloc.c +++ b/src/lib/libast/vmalloc/malloc.c @@ -641,8 +641,7 @@ void *realloc(void *data, size_t size) { ((unsigned int *)addr)[i] = 0x66666666; } } - } - else /* not our data */ + } else /* not our data */ #if USE_NATIVE addr = native_realloc(data, size); #else @@ -669,8 +668,8 @@ void free(void *data) { (void)(*vm->meth.freef)(vm, data, 0); } #if USE_NATIVE - else /* not our data */ - native_free(data); + else /* not our data */ + native_free(data); #endif } @@ -693,9 +692,7 @@ void *memalign(size_t align, size_t size) { return VMRECORD(addr); } -void *aligned_alloc(size_t align, size_t size) { - return memalign(align, ROUND(size, align)); -} +void *aligned_alloc(size_t align, size_t size) { return memalign(align, ROUND(size, align)); } int posix_memalign(void **memptr, size_t align, size_t size) { void *mem; diff --git a/src/lib/libast/vmalloc/vmclose.c b/src/lib/libast/vmalloc/vmclose.c index 6ebeef1f7182..9f329edb9469 100644 --- a/src/lib/libast/vmalloc/vmclose.c +++ b/src/lib/libast/vmalloc/vmclose.c @@ -59,7 +59,7 @@ int vmclose(Vmalloc_t *vm) { } if (disc->exceptf) /* the 3rd argument tells if vm might have been destroyed */ - (void)(*disc->exceptf)(vm, VM_ENDCLOSE, VMCAST(void *, mode & VM_MEMORYF), disc); + (void)(*disc->exceptf)(vm, VM_ENDCLOSE, VMCAST(void *, mode &VM_MEMORYF), disc); if (!(mode & VM_MEMORYF)) vmfree(Vmheap, vm); diff --git a/src/lib/libast/vmalloc/vmdcshare.c b/src/lib/libast/vmalloc/vmdcshare.c index 2877085a2e4c..7fc5d5c35842 100644 --- a/src/lib/libast/vmalloc/vmdcshare.c +++ b/src/lib/libast/vmalloc/vmdcshare.c @@ -70,7 +70,7 @@ typedef struct _mmvm_s { unsigned int magic; /* magic bytes */ - void *base; /* address to map to */ + void *base; /* address to map to */ ssize_t size; /* total data size */ ssize_t busy; /* amount in use */ key_t shmkey; /* shared segment's key */ @@ -149,7 +149,7 @@ static Mmvm_t *mmfix(Mmvm_t *mmvm, Mmdisc_t *mmdc, int fd) { ssize_t size = mmvm->size; if (base != (void *)mmvm) /* mmvm is not right yet */ - { /**/ + { /**/ DEBUG_ASSERT(!base || (base && (VMLONG(base) % _Vmpagesize) == 0)); if (mmdc->proj < 0) { munmap((void *)mmvm, size); diff --git a/src/lib/libast/vmalloc/vmdcsystem.c b/src/lib/libast/vmalloc/vmdcsystem.c index 52844ebfc896..2a6d1058763d 100644 --- a/src/lib/libast/vmalloc/vmdcsystem.c +++ b/src/lib/libast/vmalloc/vmdcsystem.c @@ -41,8 +41,8 @@ typedef struct Memdisc_s { #define STR(x) #x #define XTR(x) STR(x) -#define RESTARTMEM(a, f) \ - do { \ +#define RESTARTMEM(a, f) \ + do { \ a = (void *)f; \ if (a == (void *)(-1)) a = NULL; \ } while (a == NULL && errno == EINTR) @@ -185,8 +185,7 @@ static void *sbrkmem(Vmalloc_t *vm, void *caddr, size_t csize, size_t nsize, Vmd /* ** concurrency-safe memory allocation via mmap-anonymous providing an emulation of sbrk() */ -static void *safebrkmem(Vmalloc_t *vm, void *caddr, size_t csize, size_t nsize, - Vmdisc_t *disc) { +static void *safebrkmem(Vmalloc_t *vm, void *caddr, size_t csize, size_t nsize, Vmdisc_t *disc) { Vmuchar_t *newm; unsigned int key; @@ -245,8 +244,7 @@ static void *safebrkmem(Vmalloc_t *vm, void *caddr, size_t csize, size_t nsize, #endif /* _mem_mmap_anon */ #if _mem_mmap_anon /* getting space via mmap(MAP_ANON) */ -static void *mmapanonmem(Vmalloc_t *vm, void *caddr, size_t csize, size_t nsize, - Vmdisc_t *disc) { +static void *mmapanonmem(Vmalloc_t *vm, void *caddr, size_t csize, size_t nsize, Vmdisc_t *disc) { GETMEMCHK(vm, caddr, csize, nsize, disc); if (csize == 0) { nsize = ROUND(nsize, _Vmpagesize); diff --git a/src/lib/libast/vmalloc/vmdebug.c b/src/lib/libast/vmalloc/vmdebug.c index 7eb71a8bae64..8cfa8ae4191d 100644 --- a/src/lib/libast/vmalloc/vmdebug.c +++ b/src/lib/libast/vmalloc/vmdebug.c @@ -395,8 +395,7 @@ static void *dbresize(Vmalloc_t *vm, void *addr, size_t size, int type, int loca /* do the resize */ sz = ROUND(size, MEM_ALIGN) + DB_EXTRA; sz = sz >= sizeof(Body_t) ? sz : sizeof(Body_t); - data = - (Vmuchar_t *)KPVRESIZE(vm, (void *)data, sz, (type & ~VM_RSZERO), (*(Vmbest->resizef))); + data = (Vmuchar_t *)KPVRESIZE(vm, (void *)data, sz, (type & ~VM_RSZERO), (*(Vmbest->resizef))); if (!data) /* failed, reset data for old block */ { dbwarn(vm, NULL, DB_ALLOC, file, line, func, DB_RESIZE); diff --git a/src/lib/libast/vmalloc/vmexit.c b/src/lib/libast/vmalloc/vmexit.c index 345376452f3e..1cb00a6008d7 100644 --- a/src/lib/libast/vmalloc/vmexit.c +++ b/src/lib/libast/vmalloc/vmexit.c @@ -41,7 +41,7 @@ int atexit(void (*exitf)(void)) { return onexit(exitf); } typedef struct _exit_s { struct _exit_s *next; - void(*exitf)(void); + void (*exitf)(void); } Exit_t; static Exit_t *Exit; diff --git a/src/lib/libast/vmalloc/vmhdr.h b/src/lib/libast/vmalloc/vmhdr.h index 443678475054..45b33408e94d 100644 --- a/src/lib/libast/vmalloc/vmhdr.h +++ b/src/lib/libast/vmalloc/vmhdr.h @@ -129,7 +129,7 @@ typedef struct _seg_s Seg_t; /* the type of a raw memory segment */ #define VM_safe 0x08000000 /* safe MAP_ANON emulation of sbrk() */ #define VM_zero 0x10000000 /* /dev/zero block allocator */ -#define VM_junk 0x20000000 /* fill allocated and freed blocks with junk */ +#define VM_junk 0x20000000 /* fill allocated and freed blocks with junk */ #define VM_GETMEMORY (VM_anon | VM_break | VM_native | VM_safe | VM_zero) @@ -238,7 +238,7 @@ struct _two_s { typedef union _word_u { size_t size; /* to store a size_t */ unsigned int intdt; /* to store an integer */ - void *ptrdt; /* to store a pointer */ + void *ptrdt; /* to store a pointer */ } Word_t; struct _head_s /* a block header has two words */ @@ -334,7 +334,7 @@ struct _vmuser_s { Vmuser_t *next; unsigned int dtid; /* key to identify data item */ ssize_t size; /* size of data area */ - void *data; /* user data area */ + void *data; /* user data area */ }; struct _seg_s /* a segment of raw memory obtained via Vmdisc_t.memoryf */ @@ -382,12 +382,12 @@ struct _vmhold_s { typedef struct _vmextern_s { Block_t *(*vm_seginit)(Vmdata_t *, Seg_t *, Vmuchar_t *, ssize_t, int); Block_t *(*vm_segalloc)(Vmalloc_t *, Block_t *, ssize_t, int); - void(*vm_segfree)(Vmalloc_t *, Block_t *); + void (*vm_segfree)(Vmalloc_t *, Block_t *); char *(*vm_strcpy)(char *, const char *, int); char *(*vm_itoa)(Vmulong_t, int); - ssize_t(*vm_lcm)(ssize_t, ssize_t); - void(*vm_trace)(Vmalloc_t *, Vmuchar_t *, Vmuchar_t *, size_t, size_t); - int(*vm_chkmem)(Vmuchar_t *, size_t); + ssize_t (*vm_lcm)(ssize_t, ssize_t); + void (*vm_trace)(Vmalloc_t *, Vmuchar_t *, Vmuchar_t *, size_t, size_t); + int (*vm_chkmem)(Vmuchar_t *, size_t); Vmuchar_t *vm_memmin; /* address lower abound */ Vmuchar_t *vm_memmax; /* address upper abound */ Vmuchar_t *vm_memaddr; /* vmmaddress() memory */ diff --git a/src/lib/libast/vmalloc/vmmaddress.c b/src/lib/libast/vmalloc/vmmaddress.c index aed711614fbf..55008220d7c5 100644 --- a/src/lib/libast/vmalloc/vmmaddress.c +++ b/src/lib/libast/vmalloc/vmmaddress.c @@ -55,7 +55,7 @@ * make sure future usage follows suit */ -typedef void(*Sighandler_f)(int); +typedef void (*Sighandler_f)(int); static volatile int peek; static sigjmp_buf jmp; @@ -195,9 +195,9 @@ int _vmboundaries(void) { #if _mem_mmap_anon /* see if we can simulate sbrk(): memory grows from low to high */ /* map two consecutive pages to see if they come out adjacent */ tmp = (void *)mmap((void *)(min + z), _Vmpagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANON, -1, 0); + MAP_PRIVATE | MAP_ANON, -1, 0); shm = (void *)mmap((void *)(tmp + _Vmpagesize), _Vmpagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANON, -1, 0); + MAP_PRIVATE | MAP_ANON, -1, 0); if (tmp && tmp != (Vmuchar_t *)(-1)) munmap((void *)tmp, _Vmpagesize); if (shm && shm != (Vmuchar_t *)(-1)) munmap((void *)shm, _Vmpagesize); diff --git a/src/lib/libcmd/chmod.c b/src/lib/libcmd/chmod.c index ab6ce607b8ff..919c73cff927 100644 --- a/src/lib/libcmd/chmod.c +++ b/src/lib/libcmd/chmod.c @@ -132,25 +132,26 @@ __STDPP__directive pragma pp : hide lchmod #endif #include -#include -#include #include #include +#include +#include -extern int fts_flags(); + extern int + fts_flags(); #ifndef ENOSYS #define ENOSYS EINVAL #endif #if defined(__STDPP__directive) && defined(__STDPP__hide) - __STDPP__directive pragma pp : nohide lchmod +__STDPP__directive pragma pp : nohide lchmod #else #undef lchmod #endif - extern int - lchmod(const char *, mode_t); + extern int + lchmod(const char *, mode_t); /* * NOTE: we only use the native lchmod() on symlinks just in case @@ -222,8 +223,8 @@ int b_chmod(int argc, char **argv, Shbltin_t *context) { continue; case 'R': // Standard fts_open() does not support this flag, so instead use a different flag - //flags &= ~FTS_TOP; - recursive = 1; + // flags &= ~FTS_TOP; + recursive = 1; logical = 0; continue; case '?': @@ -295,7 +296,8 @@ int b_chmod(int argc, char **argv, Shbltin_t *context) { if (!force) error(ERROR_system(0), "%s: cannot read directory", ent->fts_path); goto anyway; case FTS_ERR: - if (!force) error(ERROR_system(0), "%s: %s", ent->fts_path, strerror(ent->fts_errno)); + if (!force) + error(ERROR_system(0), "%s: %s", ent->fts_path, strerror(ent->fts_errno)); goto anyway; case FTS_NS: if (!force) error(ERROR_system(0), "%s: not found", ent->fts_path); diff --git a/src/lib/libcmd/cmdext.h b/src/lib/libcmd/cmdext.h index b12bcc14cd83..bc214a0c8f2a 100644 --- a/src/lib/libcmd/cmdext.h +++ b/src/lib/libcmd/cmdext.h @@ -1,87 +1,87 @@ /*********************************************************************** -* * -* This software is part of the ast package * -* Copyright (c) 1992-2018 AT&T Intellectual Property * -* and is licensed under the * -* Eclipse Public License, Version 1.0 * -* by AT&T Intellectual Property * -* * -* A copy of the License is available at * -* http://www.eclipse.org/org/documents/epl-v10.html * -* (with md5 checksum b35adb5213ca9657e911e9befb180842) * -* * -* Information and Software Systems Research * -* AT&T Research * -* Florham Park NJ * -* * -* Glenn Fowler * -* David Korn * -* * -***********************************************************************/ + * * + * This software is part of the ast package * + * Copyright (c) 1992-2018 AT&T Intellectual Property * + * and is licensed under the * + * Eclipse Public License, Version 1.0 * + * by AT&T Intellectual Property * + * * + * A copy of the License is available at * + * http://www.eclipse.org/org/documents/epl-v10.html * + * (with md5 checksum b35adb5213ca9657e911e9befb180842) * + * * + * Information and Software Systems Research * + * AT&T Research * + * Florham Park NJ * + * * + * Glenn Fowler * + * David Korn * + * * + ***********************************************************************/ #ifndef CMDEXT_H #define CMDEXT_H #include -extern int b_basename (int, char**, Shbltin_t*); -extern int b_cat (int, char**, Shbltin_t*); -//extern int b_chgrp (int, char**, Shbltin_t*); -extern int b_chmod (int, char**, Shbltin_t*); -//extern int b_chown (int, char**, Shbltin_t*); -//extern int b_cksum (int, char**, Shbltin_t*); -extern int b_cmp (int, char**, Shbltin_t*); -//extern int b_comm (int, char**, Shbltin_t*); -//extern int b_cp (int, char**, Shbltin_t*); -extern int b_cut (int, char**, Shbltin_t*); -//extern int b_date (int, char**, Shbltin_t*); -extern int b_dirname (int, char**, Shbltin_t*); -//extern int b_egrep (int, char**, Shbltin_t*); -//extern int b_expr (int, char**, Shbltin_t*); -//extern int b_fds (int, char**, Shbltin_t*); -//extern int b_fgrep (int, char**, Shbltin_t*); -//extern int b_fmt (int, char**, Shbltin_t*); -//extern int b_fold (int, char**, Shbltin_t*); -extern int b_getconf (int, char**, Shbltin_t*); -//extern int b_grep (int, char**, Shbltin_t*); -extern int b_head (int, char**, Shbltin_t*); -//extern int b_iconv (int, char**, Shbltin_t*); -//extern int b_id (int, char**, Shbltin_t*); -//extern int b_join (int, char**, Shbltin_t*); -//extern int b_ln (int, char**, Shbltin_t*); -extern int b_logname (int, char**, Shbltin_t*); -//extern int b_ls (int, char**, Shbltin_t*); -//extern int b_md5sum (int, char**, Shbltin_t*); -extern int b_mkdir (int, char**, Shbltin_t*); -//extern int b_mkfifo (int, char**, Shbltin_t*); -//extern int b_mktemp (int, char**, Shbltin_t*); -//extern int b_mv (int, char**, Shbltin_t*); -//extern int b_od (int, char**, Shbltin_t*); -//extern int b_paste (int, char**, Shbltin_t*); -//extern int b_pathchk (int, char**, Shbltin_t*); -//extern int b_pids (int, char**, Shbltin_t*); -//extern int b_readlink (int, char**, Shbltin_t*); -//extern int b_realpath (int, char**, Shbltin_t*); -//extern int b_rev (int, char**, Shbltin_t*); -//extern int b_rm (int, char**, Shbltin_t*); -//extern int b_rmdir (int, char**, Shbltin_t*); -//extern int b_sha1sum (int, char**, Shbltin_t*); -//extern int b_sha256sum (int, char**, Shbltin_t*); -//extern int b_sha2sum (int, char**, Shbltin_t*); -//extern int b_sha384sum (int, char**, Shbltin_t*); -//extern int b_sha512sum (int, char**, Shbltin_t*); -//extern int b_stty (int, char**, Shbltin_t*); -//extern int b_sum (int, char**, Shbltin_t*); -extern int b_sync (int, char**, Shbltin_t*); -//extern int b_tail (int, char**, Shbltin_t*); -//extern int b_tee (int, char**, Shbltin_t*); -//extern int b_tr (int, char**, Shbltin_t*); -//extern int b_tty (int, char**, Shbltin_t*); -extern int b_uname (int, char**, Shbltin_t*); -//extern int b_uniq (int, char**, Shbltin_t*); -//extern int b_vmstate (int, char**, Shbltin_t*); -extern int b_wc (int, char**, Shbltin_t*); -//extern int b_xargs (int, char**, Shbltin_t*); -//extern int b_xgrep (int, char**, Shbltin_t*); +extern int b_basename(int, char **, Shbltin_t *); +extern int b_cat(int, char **, Shbltin_t *); +// extern int b_chgrp (int, char**, Shbltin_t*); +extern int b_chmod(int, char **, Shbltin_t *); +// extern int b_chown (int, char**, Shbltin_t*); +// extern int b_cksum (int, char**, Shbltin_t*); +extern int b_cmp(int, char **, Shbltin_t *); +// extern int b_comm (int, char**, Shbltin_t*); +// extern int b_cp (int, char**, Shbltin_t*); +extern int b_cut(int, char **, Shbltin_t *); +// extern int b_date (int, char**, Shbltin_t*); +extern int b_dirname(int, char **, Shbltin_t *); +// extern int b_egrep (int, char**, Shbltin_t*); +// extern int b_expr (int, char**, Shbltin_t*); +// extern int b_fds (int, char**, Shbltin_t*); +// extern int b_fgrep (int, char**, Shbltin_t*); +// extern int b_fmt (int, char**, Shbltin_t*); +// extern int b_fold (int, char**, Shbltin_t*); +extern int b_getconf(int, char **, Shbltin_t *); +// extern int b_grep (int, char**, Shbltin_t*); +extern int b_head(int, char **, Shbltin_t *); +// extern int b_iconv (int, char**, Shbltin_t*); +// extern int b_id (int, char**, Shbltin_t*); +// extern int b_join (int, char**, Shbltin_t*); +// extern int b_ln (int, char**, Shbltin_t*); +extern int b_logname(int, char **, Shbltin_t *); +// extern int b_ls (int, char**, Shbltin_t*); +// extern int b_md5sum (int, char**, Shbltin_t*); +extern int b_mkdir(int, char **, Shbltin_t *); +// extern int b_mkfifo (int, char**, Shbltin_t*); +// extern int b_mktemp (int, char**, Shbltin_t*); +// extern int b_mv (int, char**, Shbltin_t*); +// extern int b_od (int, char**, Shbltin_t*); +// extern int b_paste (int, char**, Shbltin_t*); +// extern int b_pathchk (int, char**, Shbltin_t*); +// extern int b_pids (int, char**, Shbltin_t*); +// extern int b_readlink (int, char**, Shbltin_t*); +// extern int b_realpath (int, char**, Shbltin_t*); +// extern int b_rev (int, char**, Shbltin_t*); +// extern int b_rm (int, char**, Shbltin_t*); +// extern int b_rmdir (int, char**, Shbltin_t*); +// extern int b_sha1sum (int, char**, Shbltin_t*); +// extern int b_sha256sum (int, char**, Shbltin_t*); +// extern int b_sha2sum (int, char**, Shbltin_t*); +// extern int b_sha384sum (int, char**, Shbltin_t*); +// extern int b_sha512sum (int, char**, Shbltin_t*); +// extern int b_stty (int, char**, Shbltin_t*); +// extern int b_sum (int, char**, Shbltin_t*); +extern int b_sync(int, char **, Shbltin_t *); +// extern int b_tail (int, char**, Shbltin_t*); +// extern int b_tee (int, char**, Shbltin_t*); +// extern int b_tr (int, char**, Shbltin_t*); +// extern int b_tty (int, char**, Shbltin_t*); +extern int b_uname(int, char **, Shbltin_t *); +// extern int b_uniq (int, char**, Shbltin_t*); +// extern int b_vmstate (int, char**, Shbltin_t*); +extern int b_wc(int, char **, Shbltin_t *); +// extern int b_xargs (int, char**, Shbltin_t*); +// extern int b_xgrep (int, char**, Shbltin_t*); #endif diff --git a/src/lib/libcmd/cut.c b/src/lib/libcmd/cut.c index 9c080ad5d986..2873ebdec7a5 100644 --- a/src/lib/libcmd/cut.c +++ b/src/lib/libcmd/cut.c @@ -1,23 +1,23 @@ /*********************************************************************** -* * -* This software is part of the ast package * -* Copyright (c) 1992-2012 AT&T Intellectual Property * -* and is licensed under the * -* Eclipse Public License, Version 1.0 * -* by AT&T Intellectual Property * -* * -* A copy of the License is available at * -* http://www.eclipse.org/org/documents/epl-v10.html * -* (with md5 checksum b35adb5213ca9657e911e9befb180842) * -* * -* Information and Software Systems Research * -* AT&T Research * -* Florham Park NJ * -* * -* Glenn Fowler * -* David Korn * -* * -***********************************************************************/ + * * + * This software is part of the ast package * + * Copyright (c) 1992-2012 AT&T Intellectual Property * + * and is licensed under the * + * Eclipse Public License, Version 1.0 * + * by AT&T Intellectual Property * + * * + * A copy of the License is available at * + * http://www.eclipse.org/org/documents/epl-v10.html * + * (with md5 checksum b35adb5213ca9657e911e9befb180842) * + * * + * Information and Software Systems Research * + * AT&T Research * + * Florham Park NJ * + * * + * Glenn Fowler * + * David Korn * + * * + ***********************************************************************/ /* * David Korn * AT&T Bell Laboratories @@ -128,8 +128,7 @@ static Cut_t *cutinit(int mode, char *str, Delim_t *wdelim, Delim_t *ldelim, siz register char *cp = str; Cut_t *cut; cut = (Cut_t *)stakalloc(sizeof(Cut_t) + strlen(cp) * sizeof(int)); - if (!cut) - error(ERROR_exit(1), "out of space"); + if (!cut) error(ERROR_exit(1), "out of space"); cut->mb = mbwide(); if (cut->mb) { memset(cut->space, 0, sizeof(cut->space) / 2); @@ -149,7 +148,7 @@ static Cut_t *cutinit(int mode, char *str, Delim_t *wdelim, Delim_t *ldelim, siz cut->nlflag = (mode & C_NONEWLINE) != 0; cut->reclen = reclen; lp = cut->list; - for (;;) { + for (;;) { switch (c = *cp++) { case ' ': case '\t': diff --git a/src/lib/libcmd/uname.c b/src/lib/libcmd/uname.c index 47f9bc95283b..e618aa9bbebc 100644 --- a/src/lib/libcmd/uname.c +++ b/src/lib/libcmd/uname.c @@ -93,7 +93,8 @@ __STDPP__directive pragma pp : hide getdomainname gethostid gethostname sethostn #undef sethostname #endif -extern int getdomainname(char *, size_t); + extern int + getdomainname(char *, size_t); extern long gethostid(void); extern int gethostname(char *, size_t); extern int sethostname(const char *, size_t); @@ -276,8 +277,7 @@ int b_uname(int argc, char **argv, Shbltin_t *context) { if (uname(&ut) < 0) error(ERROR_usage(2), "information unavailable"); output(OPT_system, ut.sysname, "sysname"); if (flags & OPT_nodename) { - if (sizeof(ut.nodename) > 9 || gethostname(s, sizeof(buf))) - s = ut.nodename; + if (sizeof(ut.nodename) > 9 || gethostname(s, sizeof(buf))) s = ut.nodename; output(OPT_nodename, s, "nodename"); } output(OPT_release, ut.release, "release"); @@ -325,8 +325,7 @@ int b_uname(int argc, char **argv, Shbltin_t *context) { output(OPT_vendor, s, "vendor"); } if (flags & OPT_domain) { - if (!*(s = astconf("SRPC_DOMAIN", NULL, NULL))) - getdomainname(s, sizeof(buf)); + if (!*(s = astconf("SRPC_DOMAIN", NULL, NULL))) getdomainname(s, sizeof(buf)); output(OPT_domain, s, "domain"); } diff --git a/src/lib/libcmd/wc.c b/src/lib/libcmd/wc.c index 3a4e9a1052e3..345420919673 100644 --- a/src/lib/libcmd/wc.c +++ b/src/lib/libcmd/wc.c @@ -1,23 +1,23 @@ /*********************************************************************** -* * -* This software is part of the ast package * -* Copyright (c) 1992-2012 AT&T Intellectual Property * -* and is licensed under the * -* Eclipse Public License, Version 1.0 * -* by AT&T Intellectual Property * -* * -* A copy of the License is available at * -* http://www.eclipse.org/org/documents/epl-v10.html * -* (with md5 checksum b35adb5213ca9657e911e9befb180842) * -* * -* Information and Software Systems Research * -* AT&T Research * -* Florham Park NJ * -* * -* Glenn Fowler * -* David Korn * -* * -***********************************************************************/ + * * + * This software is part of the ast package * + * Copyright (c) 1992-2012 AT&T Intellectual Property * + * and is licensed under the * + * Eclipse Public License, Version 1.0 * + * by AT&T Intellectual Property * + * * + * A copy of the License is available at * + * http://www.eclipse.org/org/documents/epl-v10.html * + * (with md5 checksum b35adb5213ca9657e911e9befb180842) * + * * + * Information and Software Systems Research * + * AT&T Research * + * Florham Park NJ * + * * + * Glenn Fowler * + * David Korn * + * * + ***********************************************************************/ /* * David Korn * AT&T Bell Laboratories diff --git a/src/lib/libcmd/wclib.c b/src/lib/libcmd/wclib.c index ed7876c137a4..2c2b0c782f7b 100644 --- a/src/lib/libcmd/wclib.c +++ b/src/lib/libcmd/wclib.c @@ -1,23 +1,23 @@ /*********************************************************************** -* * -* This software is part of the ast package * -* Copyright (c) 1992-2011 AT&T Intellectual Property * -* and is licensed under the * -* Eclipse Public License, Version 1.0 * -* by AT&T Intellectual Property * -* * -* A copy of the License is available at * -* http://www.eclipse.org/org/documents/epl-v10.html * -* (with md5 checksum b35adb5213ca9657e911e9befb180842) * -* * -* Information and Software Systems Research * -* AT&T Research * -* Florham Park NJ * -* * -* Glenn Fowler * -* David Korn * -* * -***********************************************************************/ + * * + * This software is part of the ast package * + * Copyright (c) 1992-2011 AT&T Intellectual Property * + * and is licensed under the * + * Eclipse Public License, Version 1.0 * + * by AT&T Intellectual Property * + * * + * A copy of the License is available at * + * http://www.eclipse.org/org/documents/epl-v10.html * + * (with md5 checksum b35adb5213ca9657e911e9befb180842) * + * * + * Information and Software Systems Research * + * AT&T Research * + * Florham Park NJ * + * * + * Glenn Fowler * + * David Korn * + * * + ***********************************************************************/ /* * David Korn * AT&T Bell Laboratories @@ -430,8 +430,7 @@ int wc_count(Wc_t *wp, Sfio_t *fd, const char *file) { if (wp->mode & WC_MBYTE) { nchars -= adjust; - } - else { + } else { nchars = nbytes; } } diff --git a/src/lib/libdll/dlldefs.h b/src/lib/libdll/dlldefs.h index 2e02135f084e..cb14ccbc580e 100644 --- a/src/lib/libdll/dlldefs.h +++ b/src/lib/libdll/dlldefs.h @@ -1,101 +1,98 @@ /*********************************************************************** -* * -* This software is part of the ast package * -* Copyright (c) 1997-2018 AT&T Intellectual Property * -* and is licensed under the * -* Eclipse Public License, Version 1.0 * -* by AT&T Intellectual Property * -* * -* A copy of the License is available at * -* http://www.eclipse.org/org/documents/epl-v10.html * -* (with md5 checksum b35adb5213ca9657e911e9befb180842) * -* * -* Information and Software Systems Research * -* AT&T Research * -* Florham Park NJ * -* * -* Glenn Fowler * -* * -***********************************************************************/ + * * + * This software is part of the ast package * + * Copyright (c) 1997-2018 AT&T Intellectual Property * + * and is licensed under the * + * Eclipse Public License, Version 1.0 * + * by AT&T Intellectual Property * + * * + * A copy of the License is available at * + * http://www.eclipse.org/org/documents/epl-v10.html * + * (with md5 checksum b35adb5213ca9657e911e9befb180842) * + * * + * Information and Software Systems Research * + * AT&T Research * + * Florham Park NJ * + * * + * Glenn Fowler * + * * + ***********************************************************************/ /* : : generated by proto : : */ /* : : generated from ast/src/lib/libdll/features/dll by iffe version 2013-11-14 : : */ - + #ifndef _def_dll_dll -#define _def_dll_dll 1 +#define _def_dll_dll 1 -#define _hdr_dlfcn 1 /* #include ok */ -#define _lib_dlopen 1 /* dlopen() in default lib(s) */ +#define _hdr_dlfcn 1 /* #include ok */ +#define _lib_dlopen 1 /* dlopen() in default lib(s) */ #if defined(__MVS__) && !defined(__SUSV3) -#define __SUSV3 1 +#define __SUSV3 1 #endif #include -#define RTLD_PARENT 0 +#define RTLD_PARENT 0 -#define DLL_INFO_PREVER 0x0001 /* pre-suffix style version */ -#define DLL_INFO_DOTVER 0x0002 /* post-suffix style version */ +#define DLL_INFO_PREVER 0x0001 /* pre-suffix style version */ +#define DLL_INFO_DOTVER 0x0002 /* post-suffix style version */ -typedef unsigned long (*Dll_plugin_version_f) (void); -typedef int (*Dllerror_f) (void*, void*, int, ...); +typedef unsigned long (*Dll_plugin_version_f)(void); +typedef int (*Dllerror_f)(void *, void *, int, ...); -typedef struct Dllinfo_s -{ - char** sibling; /* sibling dirs on $PATH */ - char* prefix; /* library name prefix */ - char* suffix; /* library name suffix */ - char* env; /* library path env var */ - int flags; /* DLL_INFO_* flags */ +typedef struct Dllinfo_s { + char **sibling; /* sibling dirs on $PATH */ + char *prefix; /* library name prefix */ + char *suffix; /* library name suffix */ + char *env; /* library path env var */ + int flags; /* DLL_INFO_* flags */ #ifdef _DLLINFO_PRIVATE_ - _DLLINFO_PRIVATE_ + _DLLINFO_PRIVATE_ #endif } Dllinfo_t; -typedef struct Dllnames_s -{ - char* id; - char* name; - char* base; - char* type; - char* opts; - char* path; - char data[1024]; +typedef struct Dllnames_s { + char *id; + char *name; + char *base; + char *type; + char *opts; + char *path; + char data[1024]; } Dllnames_t; -typedef struct Dllent_s -{ - char* path; - char* name; +typedef struct Dllent_s { + char *path; + char *name; #ifdef _DLLENT_PRIVATE_ - _DLLENT_PRIVATE_ + _DLLENT_PRIVATE_ #endif } Dllent_t; -typedef struct Dllscan_s -{ - void* pad; +typedef struct Dllscan_s { + void *pad; #ifdef _DLLSCAN_PRIVATE_ - _DLLSCAN_PRIVATE_ + _DLLSCAN_PRIVATE_ #endif } Dllscan_t; -extern Dllinfo_t* dllinfo (void); -extern void* dllplugin (const char*, const char*, const char*, unsigned long, unsigned long*, int, char*, size_t); -extern void* dllplug (const char*, const char*, const char*, int, char*, size_t); -extern void* dllfind (const char*, const char*, int, char*, size_t); -extern Dllnames_t* dllnames (const char*, const char*, Dllnames_t*); -extern void* dll_lib (Dllnames_t*, unsigned long, Dllerror_f, void*); -extern void* dllmeth (const char*, const char*, unsigned long); -extern void* dllopen (const char*, int); -extern void* dllnext (int); -extern void* dlllook (void*, const char*); -extern int dllcheck (void*, const char*, unsigned long, unsigned long*); -extern unsigned long dllversion (void*, const char*); -extern char* dllerror (int); +extern Dllinfo_t *dllinfo(void); +extern void *dllplugin(const char *, const char *, const char *, unsigned long, unsigned long *, + int, char *, size_t); +extern void *dllplug(const char *, const char *, const char *, int, char *, size_t); +extern void *dllfind(const char *, const char *, int, char *, size_t); +extern Dllnames_t *dllnames(const char *, const char *, Dllnames_t *); +extern void *dll_lib(Dllnames_t *, unsigned long, Dllerror_f, void *); +extern void *dllmeth(const char *, const char *, unsigned long); +extern void *dllopen(const char *, int); +extern void *dllnext(int); +extern void *dlllook(void *, const char *); +extern int dllcheck(void *, const char *, unsigned long, unsigned long *); +extern unsigned long dllversion(void *, const char *); +extern char *dllerror(int); -extern Dllscan_t* dllsopen (const char*, const char*, const char*); -extern Dllent_t* dllsread (Dllscan_t*); -extern int dllsclose (Dllscan_t*); +extern Dllscan_t *dllsopen(const char *, const char *, const char *); +extern Dllent_t *dllsread(Dllscan_t *); +extern int dllsclose(Dllscan_t *); #endif diff --git a/src/lib/libdll/dllscan.c b/src/lib/libdll/dllscan.c index 3805812cf548..ed97984ba17e 100644 --- a/src/lib/libdll/dllscan.c +++ b/src/lib/libdll/dllscan.c @@ -357,8 +357,7 @@ Dllent_t *dllsread(Dllscan_t *scan) { if (!(t = sfstruse(scan->tmp))) return 0; // fts_open() expects it's first argument to be NULL terminated char *argv[2] = {t, NULL}; - if ((scan->fts = fts_open(argv, FTS_LOGICAL, - vercmp)) && + if ((scan->fts = fts_open(argv, FTS_LOGICAL, vercmp)) && (scan->ent = fts_read(scan->fts)) && (scan->ent = fts_children(scan->fts, FTS_NOSTAT))) break; diff --git a/src/lib/libdll/sample.c b/src/lib/libdll/sample.c index 723330bdd24e..319b298b1fbb 100644 --- a/src/lib/libdll/sample.c +++ b/src/lib/libdll/sample.c @@ -6,5 +6,5 @@ unsigned long plugin_version(void) { return 20131127; } int b_sample(int argc, char *argv[]) { printf("This is a sample builtin"); fflush(stdout); - return 0; + return 0; }