projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed some missing includes
[NeonServV5.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index d17647d72f227ee3c5a4d742ca2e739d0e1b06f1..23903d93cc26c9ddf4e8804af3887713bd1f244a 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-58,7
+58,7
@@
static pthread_mutex_t log_sync;
static pthread_t *current_threads = NULL;
#endif
static pthread_t *current_threads = NULL;
#endif
-static void main_tread(void *empty);
+static void
*
main_tread(void *empty);
static TIMEQ_CALLBACK(clear_cache);
static TIMEQ_CALLBACK(main_checkauths);
static void check_firstrun();
static TIMEQ_CALLBACK(clear_cache);
static TIMEQ_CALLBACK(main_checkauths);
static void check_firstrun();
@@
-241,10
+241,10
@@
int getRunningThreads() {
}
static void main_start_threads() {
}
static void main_start_threads() {
- int tid_id = 0;
int worker_threads = get_int_field("General.worker_threads");
if(!worker_threads) worker_threads = 1;
#ifdef HAVE_THREADS
int worker_threads = get_int_field("General.worker_threads");
if(!worker_threads) worker_threads = 1;
#ifdef HAVE_THREADS
+ int tid_id = 0;
{
current_threads = calloc(worker_threads, sizeof(*current_threads));
for(tid_id = 0; tid_id < worker_threads; tid_id++) {
{
current_threads = calloc(worker_threads, sizeof(*current_threads));
for(tid_id = 0; tid_id < worker_threads; tid_id++) {
@@
-266,10
+266,11
@@
static void main_start_threads() {
/* MAIN FUNCTION(S) */
/* MAIN FUNCTION(S) */
-static void main_tread(void *empty) {
+static void
*
main_tread(void *empty) {
while(process_state.running) {
iohandler_poll();
}
while(process_state.running) {
iohandler_poll();
}
+ return NULL;
}
static void main_restart_process() {
}
static void main_restart_process() {
@@
-312,7
+313,7
@@
int main(int argc, char *argv[]) {
//load configuration
int errid;
//load configuration
int errid;
- if(
errid = reload_configuration(
)) {
+ if(
(errid = reload_configuration()
)) {
fprintf(stderr, "Unable to load configuration file `%s`. (errid: %d)\n", process_state.config, errid);
exit(0);
}
fprintf(stderr, "Unable to load configuration file `%s`. (errid: %d)\n", process_state.config, errid);
exit(0);
}