MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-10 05:59:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

linux fixes for new plugin arch

Browse Source
This commit is contained in:
Ron Pedde
2007-08-12 06:30:00 +00:00
parent a90bb2ab10
commit 17afc25676
3 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/io.c
View File

@@ -2958,9 +2958,9 @@ int io_wait(IO_WAITHANDLE *pwait, uint32_t *ms) {
#else
ASSERT(pwait->max_fd);
FD_COPY(&pwait->read_fds, &pwait->result_read);
FD_COPY(&pwait->write_fds, &pwait->result_write);
FD_COPY(&pwait->err_fds, &pwait->result_err);
memcpy(&pwait->result_read, &pwait->read_fds, sizeof(pwait->read_fds));
memcpy(&pwait->result_write, &pwait->write_fds, sizeof(pwait->write_fds));
memcpy(&pwait->result_err, &pwait->err_fds, sizeof(pwait->err_fds));
if(!pwait->max_fd) {
io_err_printf(IO_LOG_WARN,"No fds being monitored in io_wait\n");

25
src/rend-posix.c
View File

@@ -175,14 +175,7 @@ static mDNS_PlatformSupport PlatformStorage; // Stores this platform's globals
mDNSexport const char ProgramName[] = "mDNSResponderPosix";
static const char *gProgramName = ProgramName;
#if COMPILER_LIKES_PRAGMA_MARK
#pragma mark ***** Signals
#endif
static volatile mDNSBool gReceivedSigUsr1;
static volatile mDNSBool gReceivedSigHup;
static volatile mDNSBool gStopNow;
// We support 4 signals. (2, now -- rp)
@@ -226,9 +219,6 @@ static void HandleSigQuit(int sigraised)
exit(0);
}
#if COMPILER_LIKES_PRAGMA_MARK
#pragma mark ***** Parameter Checking
#endif
static const char kDefaultServiceType[] = "_http._tcp.";
static const char kDefaultServiceDomain[] = "local.";
@@ -236,9 +226,6 @@ enum {
kDefaultPortNumber = 80
};
#if COMPILER_LIKES_PRAGMA_MARK
#pragma mark ***** Registration
#endif
typedef struct PosixService PosixService;
@@ -258,13 +245,13 @@ static void RegistrationCallback(mDNS *const m, ServiceRecordSet *const thisRegi
switch (status) {
case mStatus_NoError:
DPRINTF(E_DBG,L_REND,"Callback: %##s Name Registered", thisRegistration->RR_SRV.resrec.name->c);
DPRINTF(E_DBG,L_REND,"Callback: %##s Name Registered\n", thisRegistration->RR_SRV.resrec.name->c);
// Do nothing; our name was successfully registered. We may
// get more call backs in the future.
break;
case mStatus_NameConflict:
DPRINTF(E_DBG,L_REND,"Callback: %##s Name Conflict", thisRegistration->RR_SRV.resrec.name->c);
DPRINTF(E_DBG,L_REND,"Callback: %##s Name Conflict\n", thisRegistration->RR_SRV.resrec.name->c);
// In the event of a conflict, this sample RegistrationCallback
// just calls mDNS_RenameAndReregisterService to automatically
@@ -282,7 +269,7 @@ static void RegistrationCallback(mDNS *const m, ServiceRecordSet *const thisRegi
break;
case mStatus_MemFree:
DPRINF(E_DBG,L_REND,"Callback: %##s Memory Free", thisRegistration->RR_SRV.resrec.name->c);
DPRINTF(E_DBG,L_REND,"Callback: %##s Memory Free\n", thisRegistration->RR_SRV.resrec.name->c);
// When debugging is enabled, make sure that thisRegistration
// is not on our gServiceList.
@@ -302,7 +289,7 @@ static void RegistrationCallback(mDNS *const m, ServiceRecordSet *const thisRegi
break;
default:
DPRINTF(E_DBG,L_REND,"Callback: %##s Unknown Status %ld", thisRegistration->RR_SRV.resrec.name->c, status);
DPRINTF(E_DBG,L_REND,"Callback: %##s Unknown Status %ld\n", thisRegistration->RR_SRV.resrec.name->c, status);
break;
}
}
@@ -374,7 +361,7 @@ static void DeregisterOurServices(void)
mDNS_DeregisterService(&mDNSStorage, &thisServ->coreServ);
DPRINF(E_DBG,L_REND,
DPRINTF(E_DBG,L_REND,
"Deregistered service %d\n",
thisServ->serviceID);
}
@@ -406,7 +393,7 @@ mDNSInterfaceID rend_get_interface_id(char *iface) {
return mDNSInterface_Any;
}
*
/*
* rend_callback
*
* This is borrowed from the OSX rend client