mirror of
https://github.com/asterisk/asterisk.git
synced 2026-01-06 01:51:14 +00:00
bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@153616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -116,7 +116,9 @@ static int load_config(void)
|
||||
return -1;
|
||||
}
|
||||
while(!feof(f)) {
|
||||
fgets(buf, sizeof(buf), f);
|
||||
if (!fgets(buf, sizeof(buf), f)) {
|
||||
continue;
|
||||
}
|
||||
if (!feof(f)) {
|
||||
lineno++;
|
||||
val = strchr(buf, '#');
|
||||
@@ -684,7 +686,10 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
if (needfork) {
|
||||
#ifndef HAVE_SBIN_LAUNCHD
|
||||
daemon(0,0);
|
||||
if (daemon(0,0) < 0) {
|
||||
fprintf(stderr, "daemon() failed: %s\n", strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
#else
|
||||
fprintf(stderr, "Mac OS X detected. Use 'launchd -d muted -f' to launch.\n");
|
||||
exit(1);
|
||||
|
||||
Reference in New Issue
Block a user