Illumos fixes
- getexecname(3) returns const char * - pid_t is long
This commit is contained in:
parent
57aa79acb8
commit
62f6351d90
3 changed files with 5 additions and 5 deletions
|
@ -756,8 +756,8 @@ solanum_main(int argc, char * const argv[])
|
||||||
check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 5);
|
check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 5);
|
||||||
|
|
||||||
if(server_state_foreground)
|
if(server_state_foreground)
|
||||||
inotice("now running in foreground mode from %s as pid %d ...",
|
inotice("now running in foreground mode from %s as pid %ld ...",
|
||||||
ConfigFileEntry.dpath, getpid());
|
ConfigFileEntry.dpath, (long)getpid());
|
||||||
|
|
||||||
rb_lib_loop(0);
|
rb_lib_loop(0);
|
||||||
|
|
||||||
|
|
|
@ -162,7 +162,7 @@ rb_path_to_self(void)
|
||||||
{
|
{
|
||||||
static char path_buf[4096];
|
static char path_buf[4096];
|
||||||
#if defined(HAVE_GETEXECNAME)
|
#if defined(HAVE_GETEXECNAME)
|
||||||
char *s = getexecname();
|
const char *s = getexecname();
|
||||||
if (s == NULL)
|
if (s == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
realpath(s, path_buf);
|
realpath(s, path_buf);
|
||||||
|
|
|
@ -908,8 +908,8 @@ stats_ssld_foreach(void *data, pid_t pid, int cli_count, enum ssld_status status
|
||||||
struct Client *source_p = data;
|
struct Client *source_p = data;
|
||||||
|
|
||||||
sendto_one_numeric(source_p, RPL_STATSDEBUG,
|
sendto_one_numeric(source_p, RPL_STATSDEBUG,
|
||||||
"S :%u %c %u :%s",
|
"S :%ld %c %u :%s",
|
||||||
pid,
|
(long)pid,
|
||||||
status == SSLD_DEAD ? 'D' : (status == SSLD_SHUTDOWN ? 'S' : 'A'),
|
status == SSLD_DEAD ? 'D' : (status == SSLD_SHUTDOWN ? 'S' : 'A'),
|
||||||
cli_count,
|
cli_count,
|
||||||
version);
|
version);
|
||||||
|
|
Loading…
Reference in a new issue