Skip to content

Commit e6af99f

Browse files
committed
Make return type of fpm_systemd_conf() void
It always returns 0
1 parent 3aeb74b commit e6af99f

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

sapi/fpm/fpm/fpm_conf.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,9 +1295,7 @@ static bool fpm_conf_post_process(int force_daemon) /* {{{ */
12951295
}
12961296

12971297
#ifdef HAVE_SYSTEMD
1298-
if (0 > fpm_systemd_conf()) {
1299-
return false;
1300-
}
1298+
fpm_systemd_conf();
13011299
#endif
13021300

13031301
#ifdef HAVE_SYSLOG_H

sapi/fpm/fpm/fpm_systemd.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void fpm_systemd_heartbeat(struct fpm_event_s *ev, short which, void *arg) /* {{
7878
}
7979
/* }}} */
8080

81-
int fpm_systemd_conf(void)
81+
void fpm_systemd_conf(void)
8282
{
8383
char *watchdog;
8484
int interval = 0;
@@ -106,5 +106,4 @@ int fpm_systemd_conf(void)
106106
/* sec to msec */
107107
fpm_global_config.systemd_interval *= 1000;
108108
}
109-
return 0;
110109
}

sapi/fpm/fpm/fpm_systemd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#define FPM_SYSTEMD_DEFAULT_HEARTBEAT (10000)
88

99
void fpm_systemd_heartbeat(struct fpm_event_s *ev, short which, void *arg);
10-
int fpm_systemd_conf(void);
10+
void fpm_systemd_conf(void);
1111

1212
#endif

0 commit comments

Comments
 (0)