diff options
Diffstat (limited to 'sd/source/ui/remotecontrol/mDNSResponder')
4 files changed, 40 insertions, 40 deletions
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c index 35b5e90277f2..7f57d88705aa 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c @@ -367,7 +367,7 @@ DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ) exit: va_end( args ); - return( err ); + return err; } @@ -419,7 +419,7 @@ DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ) break; } va_end( args ); - return( err ); + return err; } @@ -456,7 +456,7 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ) break; } va_end( args ); - return( err ); + return err; } #if 0 @@ -484,7 +484,7 @@ DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, ... ) va_end( args ); exit: - return( n ); + return n; } @@ -506,7 +506,7 @@ DEBUG_EXPORT size_t DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, DebugPrint( inLevel, buffer, (size_t) n ); exit: - return( n ); + return n; } @@ -604,7 +604,7 @@ static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize ) err = kNoErr; exit: - return( err ); + return err; } @@ -713,7 +713,7 @@ static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFi err = kNoErr; exit: - return( err ); + return err; } @@ -774,7 +774,7 @@ exit: #endif - return( err ); + return err; } @@ -870,7 +870,7 @@ exit: { CFRelease( bundle ); } - return( err ); + return err; } // DebugMacOSXLogPrint @@ -977,7 +977,7 @@ exit: { RegCloseKey( key ); } - return( err ); + return err; } @@ -1097,7 +1097,7 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, length = DebugSNPrintFVAList(sbuffer, buflen, fmt, ptr); va_end(ptr); - return(length); + return length; } @@ -1120,7 +1120,7 @@ DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char size_t nwritten = 0; int c; - if (buflen == 0) return(0); + if (buflen == 0) return 0; buflen--; // Pre-reserve one space in the buffer for the terminating nul if (buflen == 0) goto exit; @@ -1521,7 +1521,7 @@ number: if (!F.havePrecision) } exit: *sbuffer++ = 0; - return(nwritten); + return nwritten; } @@ -1926,7 +1926,7 @@ DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *dst = '\0'; s = inBuffer; } - return( s ); + return s; } @@ -2285,7 +2285,7 @@ DebugHexDump( // Note: The "dst - outBuffer" size calculation works even if "outBuffer" is NULL because it's all relative. - return( (size_t)( dst - outBuffer ) ); + return (size_t)( dst - outBuffer ); } @@ -2348,7 +2348,7 @@ static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) dlog( kDebugLevelError, "invalid NumVersion stage (0x%02X)\n", stage ); break; } - return( inString ); + return inString; } @@ -2366,7 +2366,7 @@ DEBUG_EXPORT uint32_t DebugTaskLevel( void ) } #endif - return( level ); + return level; } #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) @@ -2493,7 +2493,7 @@ DebugWinCharToTCharString( { *outTCharCount = (size_t)( dst - outTCharString ); } - return( outTCharString ); + return outTCharString; } #endif @@ -2972,7 +2972,7 @@ exit: { DebugPrintF( kDebugLevelMax, "\n\n### TEST FAILED ###\n\n" ); } - return( err ); + return err; } #endif // DEBUG diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c b/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c index ce3fce554037..49fd854c96c8 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dllmain.c @@ -32,7 +32,7 @@ BOOL APIENTRY DllMain( HANDLE inModule, DWORD inReason, LPVOID inReserved ) case DLL_PROCESS_DETACH: break; } - return( TRUE ); + return TRUE; } diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c index cca58853338c..a2c0dc6ad949 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c @@ -84,9 +84,9 @@ static uint8_t *InternalTXTRecordSearch uint8_t *x = p; p += 1 + p[0]; if (p <= e && *keylen <= x[0] && !strncasecmp(key, (char*)x+1, *keylen)) - if (*keylen == x[0] || x[1+*keylen] == '=') return(x); + if (*keylen == x[0] || x[1+*keylen] == '=') return x; } - return(NULL); + return NULL; } /********************************************************************************************* @@ -210,18 +210,18 @@ DNSServiceErrorType DNSSD_API TXTRecordSetValue const char *k; unsigned long keysize, keyvalsize; - for (k = key; *k; k++) if (*k < 0x20 || *k > 0x7E || *k == '=') return(kDNSServiceErr_Invalid); + for (k = key; *k; k++) if (*k < 0x20 || *k > 0x7E || *k == '=') return kDNSServiceErr_Invalid; keysize = (unsigned long)(k - key); keyvalsize = 1 + keysize + (value ? (1 + valueSize) : 0); - if (keysize < 1 || keyvalsize > 255) return(kDNSServiceErr_Invalid); + if (keysize < 1 || keyvalsize > 255) return kDNSServiceErr_Invalid; (void)TXTRecordRemoveValue(txtRecord, key); if (txtRec->datalen + keyvalsize > txtRec->buflen) { unsigned char *newbuf; unsigned long newlen = txtRec->datalen + keyvalsize; - if (newlen > 0xFFFF) return(kDNSServiceErr_Invalid); + if (newlen > 0xFFFF) return kDNSServiceErr_Invalid; newbuf = malloc((size_t)newlen); - if (!newbuf) return(kDNSServiceErr_NoMemory); + if (!newbuf) return kDNSServiceErr_NoMemory; memcpy(newbuf, txtRec->buffer, txtRec->datalen); if (txtRec->malloced) free(txtRec->buffer); txtRec->buffer = newbuf; @@ -240,7 +240,7 @@ DNSServiceErrorType DNSSD_API TXTRecordSetValue } *start = (uint8_t)(p - start - 1); txtRec->datalen += p - start; - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } DNSServiceErrorType DNSSD_API TXTRecordRemoveValue @@ -251,17 +251,17 @@ DNSServiceErrorType DNSSD_API TXTRecordRemoveValue { unsigned long keylen, itemlen, remainder; uint8_t *item = InternalTXTRecordSearch(txtRec->datalen, txtRec->buffer, key, &keylen); - if (!item) return(kDNSServiceErr_NoSuchKey); + if (!item) return kDNSServiceErr_NoSuchKey; itemlen = (unsigned long)(1 + item[0]); remainder = (unsigned long)((txtRec->buffer + txtRec->datalen) - (item + itemlen)); // Use memmove because memcpy behaviour is undefined for overlapping regions memmove(item, item + itemlen, remainder); txtRec->datalen -= itemlen; - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } -uint16_t DNSSD_API TXTRecordGetLength (const TXTRecordRef *txtRecord) { return(txtRec->datalen); } -const void * DNSSD_API TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) { return(txtRec->buffer); } +uint16_t DNSSD_API TXTRecordGetLength (const TXTRecordRef *txtRecord) { return txtRec->datalen; } +const void * DNSSD_API TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) { return txtRec->buffer; } /********************************************************************************************* * @@ -290,7 +290,7 @@ const void * DNSSD_API TXTRecordGetValuePtr { unsigned long keylen; uint8_t *item = InternalTXTRecordSearch(txtLen, txtRecord, key, &keylen); - if (!item || item[0] <= keylen) return(NULL); // If key not found, or found with no value, return NULL + if (!item || item[0] <= keylen) return NULL; // If key not found, or found with no value, return NULL *valueLen = (uint8_t)(item[0] - (keylen + 1)); return (item + 1 + keylen + 1); } @@ -305,7 +305,7 @@ uint16_t DNSSD_API TXTRecordGetCount uint8_t *p = (uint8_t*)txtRecord; uint8_t *e = p + txtLen; while (p<e) { p += 1 + p[0]; count++; } - return((p>e) ? (uint16_t)0 : count); + return ((p>e) ? (uint16_t)0 : count); } DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex @@ -329,7 +329,7 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex unsigned long len = 0; e = p + 1 + p[0]; while (x+len<e && x[len] != '=') len++; - if (len >= keyBufLen) return(kDNSServiceErr_NoMemory); + if (len >= keyBufLen) return kDNSServiceErr_NoMemory; memcpy(key, x, len); key[len] = 0; if (x+len<e) // If we found '=' @@ -342,9 +342,9 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex *value = NULL; *valueLen = 0; } - return(kDNSServiceErr_NoError); + return kDNSServiceErr_NoError; } - return(kDNSServiceErr_Invalid); + return kDNSServiceErr_Invalid; } /********************************************************************************************* diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c index 6059eb392c73..a538f4709001 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c @@ -68,7 +68,7 @@ uint32_t get_uint32(const char **ptr, const char *end) if (!*ptr || *ptr + sizeof(uint32_t) > end) { *ptr = NULL; - return(0); + return 0; } else { @@ -90,7 +90,7 @@ uint16_t get_uint16(const char **ptr, const char *end) if (!*ptr || *ptr + sizeof(uint16_t) > end) { *ptr = NULL; - return(0); + return 0; } else { @@ -121,7 +121,7 @@ int get_string(const char **ptr, const char *const end, char *buffer, int buflen while (*ptr < end && buffer < lim) { char c = *buffer++ = *(*ptr)++; - if (c == 0) return(0); // Success + if (c == 0) return 0; // Success } if (buffer == lim) buffer--; *buffer = 0; // Failed, so terminate string, @@ -141,7 +141,7 @@ const char *get_rdata(const char **ptr, const char *end, int rdlen) if (!*ptr || *ptr + rdlen > end) { *ptr = NULL; - return(0); + return 0; } else { |