projects
/
NeonServV5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a40e0df
)
fixed main.c multi thread support
author
pk910
<philipp@zoelle1.de>
Wed, 26 Sep 2012 14:12:56 +0000
(16:12 +0200)
committer
pk910
<philipp@zoelle1.de>
Wed, 26 Sep 2012 14:12:56 +0000
(16:12 +0200)
src/main.c
patch
|
blob
|
history
diff --git
a/src/main.c
b/src/main.c
index d17647d72f227ee3c5a4d742ca2e739d0e1b06f1..b93180b009b538f64a8764274534abb6daa4800c 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();
@@
-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);
}