diff --git a/src/alloc.c b/src/alloc.c index 2f822ef5303bb..901267b6fe9d3 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -467,7 +467,7 @@ static jl_sym_t **symtab_lookup(jl_sym_t **ptree, const char *str) uptrint_t h = hash_symbol(str, strlen(str)); // Tree nodes sorted by major key of (int(hash)) and minor key o (str). - while(*ptree != NULL) { + while (*ptree != NULL) { x = (int)(h-(*ptree)->hash); if (x == 0) { x = strcmp(str, (*ptree)->name); @@ -521,7 +521,7 @@ DLLEXPORT jl_sym_t *jl_gensym(void) return jl_symbol(n); } -DLLEXPORT jl_sym_t *jl_tagged_gensym(const char* str, int32_t len) +DLLEXPORT jl_sym_t *jl_tagged_gensym(const char *str, int32_t len) { static char gs_name[14]; char *name = (char*)alloca(sizeof(gs_name)+len+3); diff --git a/src/array.c b/src/array.c index 77a3cb670e722..e09798cdf5ee1 100644 --- a/src/array.c +++ b/src/array.c @@ -330,7 +330,7 @@ jl_array_t *jl_pchar_to_array(const char *str, size_t len) jl_value_t *jl_array_to_string(jl_array_t *a) { // TODO: check type of array? - jl_datatype_t* string_type = u8_isvalid((char*)a->data, jl_array_len(a)) == 1 ? // ASCII + jl_datatype_t *string_type = u8_isvalid((char*)a->data, jl_array_len(a)) == 1 ? // ASCII jl_ascii_string_type : jl_utf8_string_type; jl_value_t *s = (jl_value_t*)alloc_2w(); s->type = (jl_value_t*)string_type; diff --git a/src/builtins.c b/src/builtins.c index 900c6a118dd44..c39e0dc14ff9f 100644 --- a/src/builtins.c +++ b/src/builtins.c @@ -1348,7 +1348,7 @@ DLLEXPORT void jl_(void *jl_value) in_jl_--; } -DLLEXPORT void jl_breakpoint(jl_value_t* v) +DLLEXPORT void jl_breakpoint(jl_value_t *v) { // put a breakpoint in you debugger here } diff --git a/src/ccall.cpp b/src/ccall.cpp index 992399b77922a..6ae43bdf4ebd7 100644 --- a/src/ccall.cpp +++ b/src/ccall.cpp @@ -755,7 +755,7 @@ static Value *emit_ccall(jl_value_t **args, size_t nargs, jl_codectx_t *ctx) if (fptr == (void *) &jl_is_leaf_type || (f_lib==NULL && f_name && !strcmp(f_name, "jl_is_leaf_type"))) { jl_value_t *arg = args[4]; - jl_value_t* ty = expr_type(arg, ctx); + jl_value_t *ty = expr_type(arg, ctx); if (jl_is_type_type(ty) && !jl_is_typevar(jl_tparam0(ty))) { int isleaf = jl_is_leaf_type(jl_tparam0(ty)); JL_GC_POP(); diff --git a/src/cgutils.cpp b/src/cgutils.cpp index d9ed4325ac878..bae1edb922e12 100644 --- a/src/cgutils.cpp +++ b/src/cgutils.cpp @@ -340,12 +340,12 @@ static Value *literal_pointer_val(jl_value_t *p) if (!imaging_mode) return literal_static_pointer_val(p, jl_pvalue_llvmt); if (jl_is_datatype(p)) { - jl_datatype_t* addr = (jl_datatype_t*)p; + jl_datatype_t *addr = (jl_datatype_t*)p; // DataTypes are prefixed with a + return julia_gv("+", addr->name->name, addr->name->module, p); } if (jl_is_func(p)) { - jl_lambda_info_t* linfo = ((jl_function_t*)p)->linfo; + jl_lambda_info_t *linfo = ((jl_function_t*)p)->linfo; // Functions are prefixed with a - if (linfo != NULL) return julia_gv("-", linfo->name, linfo->module, p); @@ -353,12 +353,12 @@ static Value *literal_pointer_val(jl_value_t *p) return julia_gv("jl_method#", p); } if (jl_is_lambda_info(p)) { - jl_lambda_info_t* linfo = (jl_lambda_info_t*)p; + jl_lambda_info_t *linfo = (jl_lambda_info_t*)p; // Type-inferred functions are prefixed with a - return julia_gv("-", linfo->name, linfo->module, p); } if (jl_is_symbol(p)) { - jl_sym_t* addr = (jl_sym_t*)p; + jl_sym_t *addr = (jl_sym_t*)p; // Symbols are prefixed with jl_sym# return julia_gv("jl_sym#", addr, NULL, p); } diff --git a/src/codegen.cpp b/src/codegen.cpp index 8320403608a6c..058c28008bb83 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -366,7 +366,7 @@ struct jl_varinfo_t { static void jl_gen_llvm_gv_array(); extern "C" -void jl_dump_bitcode(char* fname) +void jl_dump_bitcode(char *fname) { std::string err; #ifdef LLVM35 @@ -383,7 +383,7 @@ void jl_dump_bitcode(char* fname) } extern "C" -void jl_dump_objfile(char* fname, int jit_model) +void jl_dump_objfile(char *fname, int jit_model) { std::string err; #ifdef LLVM35 @@ -3853,9 +3853,9 @@ static Function *emit_function(jl_lambda_info_t *lam, bool cstyle) // --- initialization --- -static MDNode* tbaa_make_child( const char* name, MDNode* parent, bool isConstant=false ) +static MDNode *tbaa_make_child( const char *name, MDNode *parent, bool isConstant=false ) { - MDNode* n = mbuilder->createTBAANode(name,parent,isConstant); + MDNode *n = mbuilder->createTBAANode(name,parent,isConstant); #ifdef LLVM35 n->setValueName( ValueName::Create(name)); #else diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp index 710e86410f29d..6c18485feca4e 100644 --- a/src/debuginfo.cpp +++ b/src/debuginfo.cpp @@ -266,7 +266,7 @@ void jl_getDylibFunctionInfo(const char **name, int *line, const char **filename if (fbase != 0) { #else Dl_info dlinfo; - const char* fname = 0; + const char *fname = 0; if ((dladdr((void*)pointer, &dlinfo) != 0) && dlinfo.dli_fname) { if (skipC && !jl_is_sysimg(dlinfo.dli_fname)) return; @@ -465,10 +465,10 @@ void jl_getFunctionInfo(const char **name, int *line, const char **filename, siz #if defined(_OS_WINDOWS_) && defined(_CPU_X86_64_) -extern "C" void* CALLBACK jl_getUnwindInfo(HANDLE hProcess, ULONG64 AddrBase, ULONG64 UserContext); +extern "C" void *CALLBACK jl_getUnwindInfo(HANDLE hProcess, ULONG64 AddrBase, ULONG64 UserContext); #ifndef USE_MCJIT -void* CALLBACK jl_getUnwindInfo(HANDLE hProcess, ULONG64 AddrBase, ULONG64 UserContext) +void *CALLBACK jl_getUnwindInfo(HANDLE hProcess, ULONG64 AddrBase, ULONG64 UserContext) { std::map &info = jl_jit_events->getMap(); std::map::iterator it = info.lower_bound(AddrBase); @@ -502,10 +502,10 @@ class JITMemoryManagerWin : public JITMemoryManager { virtual uint8_t *allocateSpace(intptr_t Size, unsigned Alignment) { return JMM->allocateSpace(Size,Alignment); } virtual uint8_t *allocateGlobal(uintptr_t Size, unsigned Alignment) { return JMM->allocateGlobal(Size,Alignment); } virtual void deallocateFunctionBody(void *Body) { return JMM->deallocateFunctionBody(Body); } - virtual uint8_t* startExceptionTable(const Function* F, + virtual uint8_t *startExceptionTable(const Function* F, uintptr_t &ActualSize) { return JMM->startExceptionTable(F,ActualSize); } virtual void endExceptionTable(const Function *F, uint8_t *TableStart, - uint8_t *TableEnd, uint8_t* FrameRegister) { return JMM->endExceptionTable(F,TableStart,TableEnd,FrameRegister); } + uint8_t *TableEnd, uint8_t *FrameRegister) { return JMM->endExceptionTable(F,TableStart,TableEnd,FrameRegister); } virtual void deallocateExceptionTable(void *ET) { return JMM->deallocateExceptionTable(ET); } virtual bool CheckInvariants(std::string &str) { return JMM->CheckInvariants(str); } virtual size_t GetDefaultCodeSlabSize() { return JMM->GetDefaultCodeSlabSize(); } @@ -533,7 +533,7 @@ class JITMemoryManagerWin : public JITMemoryManager { }; #else -void* CALLBACK jl_getUnwindInfo(HANDLE hProcess, ULONG64 AddrBase, ULONG64 UserContext) +void *CALLBACK jl_getUnwindInfo(HANDLE hProcess, ULONG64 AddrBase, ULONG64 UserContext) { return NULL; } @@ -565,7 +565,7 @@ static void coverageVisitLine(std::string filename, int line) v); } -void write_log_data(logdata_t logData, const char* extension) +void write_log_data(logdata_t logData, const char *extension) { std::string base = std::string(julia_home); base = base + "/../share/julia/base/"; diff --git a/src/disasm.cpp b/src/disasm.cpp index 661a228cc33ee..adbfb21a198ed 100644 --- a/src/disasm.cpp +++ b/src/disasm.cpp @@ -25,12 +25,12 @@ using namespace llvm; namespace { class FuncMCView : public MemoryObject { private: - const char* Fptr; + const char *Fptr; size_t Fsize; public: - FuncMCView(const void* fptr, size_t size) : Fptr((const char*)fptr), Fsize(size) {} + FuncMCView(const void *fptr, size_t size) : Fptr((const char*)fptr), Fsize(size) {} - const char* operator[] (const size_t idx) { return (Fptr+idx); } + const char *operator[] (const size_t idx) { return (Fptr+idx); } uint64_t getBase() const { return 0; } uint64_t getExtent() const { return Fsize; } diff --git a/src/dlload.c b/src/dlload.c index d9d0f4562f264..a2fac42d8f431 100644 --- a/src/dlload.c +++ b/src/dlload.c @@ -42,7 +42,7 @@ char *jl_lookup_soname(char *pfx, size_t n); #define JL_RTLD(flags, FLAG) (flags & JL_RTLD_ ## FLAG ? RTLD_ ## FLAG : 0) -static int jl_uv_dlopen(const char* filename, uv_lib_t* lib, unsigned flags) +static int jl_uv_dlopen(const char *filename, uv_lib_t *lib, unsigned flags) { #if defined(_OS_WINDOWS_) needsSymRefreshModuleList = 1; @@ -107,7 +107,7 @@ static uv_lib_t *jl_load_dynamic_library_(char *modname, unsigned flags, int thr if (!error) goto done; } else if (jl_base_module != NULL) { - jl_array_t* DL_LOAD_PATH = (jl_array_t*)jl_get_global(jl_base_module, jl_symbol("DL_LOAD_PATH")); + jl_array_t *DL_LOAD_PATH = (jl_array_t*)jl_get_global(jl_base_module, jl_symbol("DL_LOAD_PATH")); if (DL_LOAD_PATH != NULL) { size_t j; for (j = 0; j < jl_array_len(DL_LOAD_PATH); j++) { diff --git a/src/dump.c b/src/dump.c index eb90c95a54fb2..fe0117ec03865 100644 --- a/src/dump.c +++ b/src/dump.c @@ -946,7 +946,7 @@ static jl_value_t *jl_deserialize_value_internal(ios_t *s) return NULL; } -static jl_value_t* jl_deserialize_value(ios_t *s) +static jl_value_t *jl_deserialize_value(ios_t *s) { jl_value_t *v = jl_deserialize_value_internal(s); assert(v != DTINSTANCE_PLACEHOLDER); diff --git a/src/gf.c b/src/gf.c index ff4303510777c..de493f0cbf16d 100644 --- a/src/gf.c +++ b/src/gf.c @@ -1425,7 +1425,7 @@ JL_CALLABLE(jl_apply_generic) return jl_no_method_error((jl_function_t*)F, args, nargs); } assert(!mfunc->linfo || !mfunc->linfo->inInference); - jl_value_t* res = jl_apply(mfunc, args, nargs); + jl_value_t *res = jl_apply(mfunc, args, nargs); JL_GC_POP(); return res; } diff --git a/src/init.c b/src/init.c index 9a38f0eb46b54..fa0d5d43507af 100644 --- a/src/init.c +++ b/src/init.c @@ -391,7 +391,7 @@ void sigint_handler(int sig, siginfo_t *info, void *context) struct uv_shutdown_queue_item { uv_handle_t *h; struct uv_shutdown_queue_item *next; }; struct uv_shutdown_queue { struct uv_shutdown_queue_item *first; struct uv_shutdown_queue_item *last; }; -static void jl_uv_exitcleanup_add(uv_handle_t* handle, struct uv_shutdown_queue *queue) +static void jl_uv_exitcleanup_add(uv_handle_t *handle, struct uv_shutdown_queue *queue) { struct uv_shutdown_queue_item *item = (struct uv_shutdown_queue_item*)malloc(sizeof(struct uv_shutdown_queue_item)); item->h = handle; @@ -401,7 +401,7 @@ static void jl_uv_exitcleanup_add(uv_handle_t* handle, struct uv_shutdown_queue queue->last = item; } -static void jl_uv_exitcleanup_walk(uv_handle_t* handle, void *arg) +static void jl_uv_exitcleanup_walk(uv_handle_t *handle, void *arg) { if (handle != (uv_handle_t*)jl_uv_stdout && handle != (uv_handle_t*)jl_uv_stderr) jl_uv_exitcleanup_add(handle, (struct uv_shutdown_queue*)arg); @@ -434,7 +434,7 @@ DLLEXPORT void uv_atexit_hook() jl_gc_run_all_finalizers(); - uv_loop_t* loop = jl_global_event_loop(); + uv_loop_t *loop = jl_global_event_loop(); struct uv_shutdown_queue queue = {NULL, NULL}; uv_walk(loop, jl_uv_exitcleanup_walk, &queue); // close stdout and stderr last, since we like being @@ -736,7 +736,7 @@ void julia_init(char *imageFile) init_stdio(); #if defined(JL_USE_INTEL_JITEVENTS) - const char* jit_profiling = getenv("ENABLE_JITPROFILING"); + const char *jit_profiling = getenv("ENABLE_JITPROFILING"); if (jit_profiling && atoi(jit_profiling)) { jl_using_intel_jitevents = 1; #if defined(__linux__) @@ -961,7 +961,7 @@ DLLEXPORT void jl_install_sigint_handler() } extern int asprintf(char **str, const char *fmt, ...); -extern void * __stack_chk_guard; +extern void *__stack_chk_guard; DLLEXPORT int julia_trampoline(int argc, char **argv, int (*pmain)(int ac,char *av[])) { diff --git a/src/jl_uv.c b/src/jl_uv.c index b209426aa9e94..bba8b0d10fa2e 100644 --- a/src/jl_uv.c +++ b/src/jl_uv.c @@ -140,7 +140,7 @@ jl_value_t *jl_callback_call(jl_function_t *f,jl_value_t *val,int count,...) return v; } -DLLEXPORT void jl_uv_closeHandle(uv_handle_t* handle) +DLLEXPORT void jl_uv_closeHandle(uv_handle_t *handle) { if (handle->data) { JULIA_CB(close,handle->data,0); @@ -148,7 +148,7 @@ DLLEXPORT void jl_uv_closeHandle(uv_handle_t* handle) free(handle); } -DLLEXPORT void jl_uv_shutdownCallback(uv_shutdown_t* req, int status) +DLLEXPORT void jl_uv_shutdownCallback(uv_shutdown_t *req, int status) { /* * This happens if the remote machine closes the connecition while we're @@ -166,12 +166,12 @@ DLLEXPORT void jl_uv_return_spawn(uv_process_t *p, int64_t exit_status, int term JULIA_CB(return_spawn,p->data,2,CB_INT64,exit_status,CB_INT32,term_signal); } -DLLEXPORT void jl_uv_readcb(uv_stream_t *handle, ssize_t nread, const uv_buf_t* buf) +DLLEXPORT void jl_uv_readcb(uv_stream_t *handle, ssize_t nread, const uv_buf_t *buf) { JULIA_CB(readcb,handle->data,3,CB_INT,nread,CB_PTR,(buf->base),CB_UINT,buf->len); } -DLLEXPORT void jl_uv_alloc_buf(uv_handle_t *handle, size_t suggested_size, uv_buf_t* buf) +DLLEXPORT void jl_uv_alloc_buf(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) { if (handle->data) { jl_value_t *ret = JULIA_CB(alloc_buf,handle->data,1,CB_UINT,suggested_size); @@ -216,23 +216,23 @@ DLLEXPORT void jl_uv_pollcb(uv_poll_t *handle, int status, int events) JULIA_CB(pollcb,handle->data,2,CB_INT32,status,CB_INT32,events); } -DLLEXPORT void jl_uv_fspollcb(uv_fs_poll_t* handle, int status, const uv_stat_t* prev, const uv_stat_t* curr) +DLLEXPORT void jl_uv_fspollcb(uv_fs_poll_t *handle, int status, const uv_stat_t *prev, const uv_stat_t *curr) { JULIA_CB(fspollcb,handle->data,3,CB_INT32,status,CB_PTR,prev,CB_PTR,curr); } -DLLEXPORT void jl_uv_fseventscb(uv_fs_event_t* handle, const char* filename, int events, int status) +DLLEXPORT void jl_uv_fseventscb(uv_fs_event_t *handle, const char *filename, int events, int status) { JULIA_CB(fseventscb,handle->data,3,CB_PTR,filename,CB_INT32,events,CB_INT32,status); } -DLLEXPORT void jl_uv_recvcb(uv_udp_t* handle, ssize_t nread, const uv_buf_t *buf, struct sockaddr* addr, unsigned flags) +DLLEXPORT void jl_uv_recvcb(uv_udp_t *handle, ssize_t nread, const uv_buf_t *buf, struct sockaddr* addr, unsigned flags) { JULIA_CB(recv,handle->data,5,CB_INT,nread,CB_PTR,(buf->base),CB_UINT,buf->len,CB_PTR,addr,CB_INT32,flags); } -DLLEXPORT void jl_uv_sendcb(uv_udp_send_t* handle, int status) +DLLEXPORT void jl_uv_sendcb(uv_udp_send_t *handle, int status) { JULIA_CB(send,handle->data,1,CB_INT32,status); free(handle); @@ -325,7 +325,7 @@ DLLEXPORT void jl_uv_disassociate_julia_struct(uv_handle_t *handle) handle->data = NULL; } -DLLEXPORT int jl_listen(uv_stream_t* stream, int backlog) +DLLEXPORT int jl_listen(uv_stream_t *stream, int backlog) { return uv_listen(stream,backlog,&jl_uv_connectioncb); } @@ -385,18 +385,18 @@ DLLEXPORT uv_loop_t *jl_global_event_loop(void) return jl_io_loop; } -DLLEXPORT int jl_poll_start(uv_poll_t* handle, int32_t events) +DLLEXPORT int jl_poll_start(uv_poll_t *handle, int32_t events) { return uv_poll_start(handle, events, &jl_uv_pollcb); } -DLLEXPORT int jl_fs_poll_start(uv_fs_poll_t* handle, char *file, uint32_t interval) +DLLEXPORT int jl_fs_poll_start(uv_fs_poll_t *handle, char *file, uint32_t interval) { return uv_fs_poll_start(handle,&jl_uv_fspollcb,file,interval); } -DLLEXPORT int jl_fs_event_init(uv_loop_t* loop, uv_fs_event_t* handle, - const char* filename, int flags) +DLLEXPORT int jl_fs_event_init(uv_loop_t *loop, uv_fs_event_t *handle, + const char *filename, int flags) { uv_fs_event_init(loop,handle); return uv_fs_event_start(handle,&jl_uv_fseventscb,filename,flags); @@ -504,7 +504,7 @@ DLLEXPORT int jl_puts(char *str, uv_stream_t *stream) return jl_write(stream,str,strlen(str)); } -DLLEXPORT void jl_uv_writecb(uv_write_t* req, int status) +DLLEXPORT void jl_uv_writecb(uv_write_t *req, int status) { if (req->data) { JULIA_CB(writecb, req->data, 2, CB_PTR, req, CB_INT32, status); @@ -512,7 +512,7 @@ DLLEXPORT void jl_uv_writecb(uv_write_t* req, int status) free(req); } -DLLEXPORT void jl_uv_writecb_task(uv_write_t* req, int status) +DLLEXPORT void jl_uv_writecb_task(uv_write_t *req, int status) { JULIA_CB(writecb_task, req->handle->data, 2, CB_PTR, req, CB_INT32, status); free(req); @@ -697,7 +697,7 @@ DLLEXPORT int jl_getpid() } //NOTE: These function expects port/host to be in network byte-order (Big Endian) -DLLEXPORT int jl_tcp_bind(uv_tcp_t* handle, uint16_t port, uint32_t host, unsigned int flags) +DLLEXPORT int jl_tcp_bind(uv_tcp_t *handle, uint16_t port, uint32_t host, unsigned int flags) { struct sockaddr_in addr; memset(&addr, 0, sizeof(struct sockaddr_in)); @@ -706,7 +706,7 @@ DLLEXPORT int jl_tcp_bind(uv_tcp_t* handle, uint16_t port, uint32_t host, unsign addr.sin_family = AF_INET; return uv_tcp_bind(handle, (struct sockaddr*)&addr, flags); } -DLLEXPORT int jl_tcp_bind6(uv_tcp_t* handle, uint16_t port, void *host, unsigned int flags) +DLLEXPORT int jl_tcp_bind6(uv_tcp_t *handle, uint16_t port, void *host, unsigned int flags) { struct sockaddr_in6 addr; memset(&addr, 0, sizeof(struct sockaddr_in6)); @@ -716,7 +716,7 @@ DLLEXPORT int jl_tcp_bind6(uv_tcp_t* handle, uint16_t port, void *host, unsigned return uv_tcp_bind(handle, (struct sockaddr*)&addr, flags); } -DLLEXPORT int jl_udp_bind(uv_udp_t* handle, uint16_t port, uint32_t host, uint32_t flags) +DLLEXPORT int jl_udp_bind(uv_udp_t *handle, uint16_t port, uint32_t host, uint32_t flags) { struct sockaddr_in addr; memset(&addr, 0, sizeof(struct sockaddr_in)); @@ -725,7 +725,7 @@ DLLEXPORT int jl_udp_bind(uv_udp_t* handle, uint16_t port, uint32_t host, uint32 addr.sin_family = AF_INET; return uv_udp_bind(handle, (struct sockaddr*)&addr, flags); } -DLLEXPORT int jl_udp_bind6(uv_udp_t* handle, uint16_t port, void *host, uint32_t flags) +DLLEXPORT int jl_udp_bind6(uv_udp_t *handle, uint16_t port, void *host, uint32_t flags) { struct sockaddr_in6 addr; memset(&addr, 0, sizeof(struct sockaddr_in6)); @@ -735,7 +735,7 @@ DLLEXPORT int jl_udp_bind6(uv_udp_t* handle, uint16_t port, void *host, uint32_t return uv_udp_bind(handle, (struct sockaddr*)&addr, flags); } -DLLEXPORT int jl_udp_send(uv_udp_t* handle, uint16_t port, uint32_t host, void *data, uint32_t size) +DLLEXPORT int jl_udp_send(uv_udp_t *handle, uint16_t port, uint32_t host, void *data, uint32_t size) { struct sockaddr_in addr; memset(&addr, 0, sizeof(struct sockaddr_in)); @@ -745,12 +745,12 @@ DLLEXPORT int jl_udp_send(uv_udp_t* handle, uint16_t port, uint32_t host, void * uv_buf_t buf[1]; buf[0].base = (char *) data; buf[0].len = size; - uv_udp_send_t *req = (uv_udp_send_t *) malloc(sizeof(uv_udp_send_t)); + uv_udp_send_t *req = (uv_udp_send_t*)malloc(sizeof(uv_udp_send_t)); req->data = handle->data; return uv_udp_send(req, handle, buf, 1, (struct sockaddr*)&addr, &jl_uv_sendcb); } -DLLEXPORT int jl_udp_send6(uv_udp_t* handle, uint16_t port, void *host, void *data, uint32_t size) +DLLEXPORT int jl_udp_send6(uv_udp_t *handle, uint16_t port, void *host, void *data, uint32_t size) { struct sockaddr_in6 addr; memset(&addr, 0, sizeof(struct sockaddr_in6)); @@ -1003,7 +1003,7 @@ DLLEXPORT void *jl_uv_handle_data(uv_handle_t *handle) #ifndef _OS_WINDOWS_ #if defined(__APPLE__) -int uv___stream_fd(uv_stream_t* handle); +int uv___stream_fd(uv_stream_t *handle); #define uv__stream_fd(handle) (uv___stream_fd((uv_stream_t*)(handle))) #else #define uv__stream_fd(handle) ((handle)->io_watcher.fd) diff --git a/src/jlapi.c b/src/jlapi.c index 39106ab6c06d6..2887b0669afac 100644 --- a/src/jlapi.c +++ b/src/jlapi.c @@ -22,7 +22,7 @@ DLLEXPORT char * __cdecl basename(char *); #include #endif -DLLEXPORT char *jl_locate_sysimg(char *jlhome, char* imgpath) +DLLEXPORT char *jl_locate_sysimg(char *jlhome, char *imgpath) { if (jlhome == NULL) { char *julia_path = (char*)malloc(512); diff --git a/src/julia.h b/src/julia.h index da529eb990f89..f8bf0d89b35bc 100644 --- a/src/julia.h +++ b/src/julia.h @@ -1261,10 +1261,10 @@ DLLEXPORT int jl_puts(char *str, uv_stream_t *stream); DLLEXPORT int jl_pututf8(uv_stream_t *s, uint32_t wchar); DLLEXPORT uv_timer_t *jl_make_timer(uv_loop_t *loop, jl_value_t *julia_struct); -DLLEXPORT int jl_timer_stop(uv_timer_t* timer); +DLLEXPORT int jl_timer_stop(uv_timer_t *timer); DLLEXPORT uv_tcp_t *jl_tcp_init(uv_loop_t *loop); -DLLEXPORT int jl_tcp_bind(uv_tcp_t* handle, uint16_t port, uint32_t host, unsigned int flags); +DLLEXPORT int jl_tcp_bind(uv_tcp_t *handle, uint16_t port, uint32_t host, unsigned int flags); DLLEXPORT int jl_sizeof_ios_t(void); diff --git a/src/profile.c b/src/profile.c index 6fbe728ec37d7..e4343ee1727ac 100644 --- a/src/profile.c +++ b/src/profile.c @@ -8,7 +8,7 @@ extern "C" { #endif -static volatile ptrint_t* bt_data_prof = NULL; +static volatile ptrint_t *bt_data_prof = NULL; static volatile size_t bt_size_max = 0; static volatile size_t bt_size_cur = 0; static volatile u_int64_t nsecprof = 0; @@ -437,7 +437,7 @@ DLLEXPORT int jl_profile_init(size_t maxsize, u_int64_t delay_nsec) return 0; } -DLLEXPORT u_int8_t* jl_profile_get_data(void) +DLLEXPORT u_int8_t *jl_profile_get_data(void) { return (u_int8_t*) bt_data_prof; } diff --git a/src/support/hashing.c b/src/support/hashing.c index f6acd130d257b..3a19915acea0d 100644 --- a/src/support/hashing.c +++ b/src/support/hashing.c @@ -63,7 +63,7 @@ u_int32_t int64to32hash(u_int64_t key) #define _MHASH_SEED_ 0xcafe8881 -uint64_t memhash(const char* buf, size_t n) +uint64_t memhash(const char *buf, size_t n) { uint64_t out[2]; @@ -76,7 +76,7 @@ uint64_t memhash(const char* buf, size_t n) return out[1]; } -uint64_t memhash_seed(const char* buf, size_t n, uint32_t seed) +uint64_t memhash_seed(const char *buf, size_t n, uint32_t seed) { uint64_t out[2]; @@ -89,7 +89,7 @@ uint64_t memhash_seed(const char* buf, size_t n, uint32_t seed) return out[1]; } -uint32_t memhash32(const char* buf, size_t n) +uint32_t memhash32(const char *buf, size_t n) { uint32_t out; @@ -97,7 +97,7 @@ uint32_t memhash32(const char* buf, size_t n) return out; } -uint32_t memhash32_seed(const char* buf, size_t n, uint32_t seed) +uint32_t memhash32_seed(const char *buf, size_t n, uint32_t seed) { uint32_t out; diff --git a/src/support/hashing.h b/src/support/hashing.h index 250adfd8d0360..8d8f9fa249e5f 100644 --- a/src/support/hashing.h +++ b/src/support/hashing.h @@ -14,10 +14,10 @@ DLLEXPORT u_int32_t int64to32hash(u_int64_t key); #else #define inthash int32hash #endif -DLLEXPORT u_int64_t memhash(const char* buf, size_t n); -DLLEXPORT u_int64_t memhash_seed(const char* buf, size_t n, u_int32_t seed); -DLLEXPORT u_int32_t memhash32(const char* buf, size_t n); -DLLEXPORT u_int32_t memhash32_seed(const char* buf, size_t n, u_int32_t seed); +DLLEXPORT u_int64_t memhash(const char *buf, size_t n); +DLLEXPORT u_int64_t memhash_seed(const char *buf, size_t n, u_int32_t seed); +DLLEXPORT u_int32_t memhash32(const char *buf, size_t n); +DLLEXPORT u_int32_t memhash32_seed(const char *buf, size_t n, u_int32_t seed); #ifdef __cplusplus } diff --git a/src/support/utf8.c b/src/support/utf8.c index 989496e40a307..2533248eb33e3 100644 --- a/src/support/utf8.c +++ b/src/support/utf8.c @@ -584,11 +584,11 @@ int u8_is_locale_utf8(const char *locale) if (locale == NULL) return 0; /* this code based on libutf8 */ - const char* cp = locale; + const char *cp = locale; for (; *cp != '\0' && *cp != '@' && *cp != '+' && *cp != ',' && *cp != ';'; cp++) { if (*cp == '.') { - const char* encoding = ++cp; + const char *encoding = ++cp; for (; *cp != '\0' && *cp != '@' && *cp != '+' && *cp != ',' && *cp != ';'; cp++) ; if ((cp-encoding == 5 && !strncmp(encoding, "UTF-8", 5)) diff --git a/src/sys.c b/src/sys.c index 1c4e2d8736db3..b12ae204941c1 100644 --- a/src/sys.c +++ b/src/sys.c @@ -99,25 +99,25 @@ DLLEXPORT int jl_ios_eof(ios_t *s) // --- dir/file stuff --- DLLEXPORT int jl_sizeof_uv_fs_t(void) { return sizeof(uv_fs_t); } -DLLEXPORT void jl_uv_fs_req_cleanup(uv_fs_t* req) +DLLEXPORT void jl_uv_fs_req_cleanup(uv_fs_t *req) { uv_fs_req_cleanup(req); } -DLLEXPORT int jl_readdir(const char* path, uv_fs_t* readdir_req) +DLLEXPORT int jl_readdir(const char *path, uv_fs_t *readdir_req) { // Note that the flags field is mostly ignored by libuv return uv_fs_readdir(uv_default_loop(), readdir_req, path, 0 /*flags*/, NULL); } -DLLEXPORT char* jl_uv_fs_t_ptr(uv_fs_t* req) { return (char*)req->ptr; } -DLLEXPORT char* jl_uv_fs_t_ptr_offset(uv_fs_t* req, int offset) { return (char*)req->ptr + offset; } +DLLEXPORT char *jl_uv_fs_t_ptr(uv_fs_t *req) { return (char*)req->ptr; } +DLLEXPORT char *jl_uv_fs_t_ptr_offset(uv_fs_t *req, int offset) { return (char*)req->ptr + offset; } DLLEXPORT int jl_uv_fs_result(uv_fs_t *f) { return f->result; } // --- stat --- DLLEXPORT int jl_sizeof_stat(void) { return sizeof(uv_stat_t); } -DLLEXPORT int32_t jl_stat(const char* path, char* statbuf) +DLLEXPORT int32_t jl_stat(const char *path, char *statbuf) { uv_fs_t req; int ret; @@ -131,7 +131,7 @@ DLLEXPORT int32_t jl_stat(const char* path, char* statbuf) return ret; } -DLLEXPORT int32_t jl_lstat(const char* path, char* statbuf) +DLLEXPORT int32_t jl_lstat(const char *path, char *statbuf) { uv_fs_t req; int ret; @@ -480,7 +480,8 @@ DLLEXPORT uint8_t jl_zero_subnormals(uint8_t isZero) // -- processor native alignment information -- -DLLEXPORT void jl_native_alignment(uint_t* int8align, uint_t* int16align, uint_t* int32align, uint_t* int64align, uint_t* float32align, uint_t* float64align) +DLLEXPORT void jl_native_alignment(uint_t *int8align, uint_t *int16align, uint_t *int32align, + uint_t *int64align, uint_t *float32align, uint_t *float64align) { LLVMTargetDataRef tgtdata = LLVMCreateTargetData(""); *int8align = LLVMPreferredAlignmentOfType(tgtdata, LLVMInt8Type()); diff --git a/src/task.c b/src/task.c index a7325da7e0321..c1bb4640a740c 100644 --- a/src/task.c +++ b/src/task.c @@ -184,7 +184,7 @@ void __declspec(noinline) restore_stack(jl_task_t *t, jl_jmp_buf *where, char *p void __attribute__((noinline)) restore_stack(jl_task_t *t, jl_jmp_buf *where, char *p) #endif { - char* _x = (char*)t->stackbase - t->ssize; + char *_x = (char*)t->stackbase - t->ssize; if (!p) { p = _x; if ((char*)&_x > _x) { @@ -458,7 +458,7 @@ size_t bt_size = 0; void jl_getFunctionInfo(const char **name, int *line, const char **filename, size_t pointer, int skipC); -static const char* name_unknown = "???"; +static const char *name_unknown = "???"; static int frame_info_from_ip(const char **func_name, int *line_num, const char **file_name, size_t ip, int skipC) { int fromC = 0;