From 00aac5fdeb165263cdf6ac1d6761b75d6ac56f0f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 1 Dec 2017 23:59:09 -0500 Subject: [PATCH] drivers: Add spaces around preprocessor macros in string literals. It is illegal not to have these in C++11. --- .../kernel/drivers/audio/ac97/sis7018/Settings.cpp | 2 +- src/add-ons/kernel/drivers/audio/echo/echo.cpp | 10 +++++----- src/add-ons/kernel/drivers/network/sis19x/Settings.cpp | 10 +++++----- .../kernel/drivers/network/usb_asix/Settings.cpp | 4 ++-- .../kernel/drivers/network/usb_davicom/Settings.cpp | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Settings.cpp b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Settings.cpp index 06df5c8435..c1e1990982 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Settings.cpp +++ b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Settings.cpp @@ -48,7 +48,7 @@ void load_settings() gAddTimeStamp = get_driver_boolean_parameter(handle, "add_timestamp", gAddTimeStamp, true); const char * logFilePath = get_driver_parameter(handle, "logfile", - NULL, "/var/log/"DRIVER_NAME".log"); + NULL, "/var/log/" DRIVER_NAME ".log"); if (logFilePath != NULL) { gLogFilePath = strdup(logFilePath); } diff --git a/src/add-ons/kernel/drivers/audio/echo/echo.cpp b/src/add-ons/kernel/drivers/audio/echo/echo.cpp index 85227f23d5..4639053140 100644 --- a/src/add-ons/kernel/drivers/audio/echo/echo.cpp +++ b/src/add-ons/kernel/drivers/audio/echo/echo.cpp @@ -592,7 +592,7 @@ init_driver(void) )) { if (num_cards == NUM_CARDS) { - PRINT(("Too many "DRIVER_NAME" cards installed!\n")); + PRINT(("Too many " DRIVER_NAME " cards installed!\n")); break; } memset(&cards[num_cards], 0, sizeof(echo_dev)); @@ -608,7 +608,7 @@ init_driver(void) } #endif if (echo_setup(&cards[num_cards])) { - PRINT(("Setup of "DRIVER_NAME" %ld failed\n", num_cards + 1)); + PRINT(("Setup of " DRIVER_NAME " %ld failed\n", num_cards + 1)); #ifdef __HAIKU__ (*pci->unreserve_device)(info.bus, info.device, info.function, DRIVER_NAME, &cards[num_cards]); @@ -636,10 +636,10 @@ static void make_device_names(echo_dev * card) { #ifdef MIDI_SUPPORT - sprintf(card->midi.name, "midi/"DRIVER_NAME"/%ld", card-cards + 1); + sprintf(card->midi.name, "midi/" DRIVER_NAME "/%ld", card-cards + 1); names[num_names++] = card->midi.name; #endif - sprintf(card->name, "audio/hmulti/"DRIVER_NAME"/%ld", card-cards + 1); + sprintf(card->name, "audio/hmulti/" DRIVER_NAME "/%ld", card-cards + 1); names[num_names++] = card->name; names[num_names] = NULL; @@ -807,7 +807,7 @@ echo_setup(echo_dev * card) break; #endif default: - PRINT(("card type 0x%x not supported by "DRIVER_NAME"\n", + PRINT(("card type 0x%x not supported by " DRIVER_NAME "\n", card->type)); } diff --git a/src/add-ons/kernel/drivers/network/sis19x/Settings.cpp b/src/add-ons/kernel/drivers/network/sis19x/Settings.cpp index f253af6ba9..51a595c26c 100644 --- a/src/add-ons/kernel/drivers/network/sis19x/Settings.cpp +++ b/src/add-ons/kernel/drivers/network/sis19x/Settings.cpp @@ -62,7 +62,7 @@ void load_settings() handle, "add_timestamp", gAddTimeStamp, true); const char * logFilePath = get_driver_parameter( - handle, "logfile", NULL, "/var/log/"DRIVER_NAME".log"); + handle, "logfile", NULL, "/var/log/" DRIVER_NAME ".log"); if (logFilePath != NULL) { gLogFilePath = strdup(logFilePath); } @@ -146,7 +146,7 @@ Statistics::PutStatus(uint32 status) fInterrupts++; if (status & (INT_TXDONE /*| INT_TXIDLE*/)) fTxInterrupts++; if (status & (INT_RXDONE /*| INT_RXIDLE*/)) fRxInterrupts++; - + if (status & INT_TXHALT) fTxHalt++; if (status & INT_RXHALT) fRxHalt++; if (status & INT_TXDONE) fTxDone++; @@ -197,15 +197,15 @@ void Statistics::Trace() { TRACE("Ints:%d;Lnk:%d;WkUps:%d;Mgic:%d;Pause:%d;Tmr:%d;Sft:%d\n", fInterrupts, fLink, fWakeUp, fMagic, fPause, fTimer, fSoft); - + TRACE("TX:Ints:%d;Bts:%llu;Drop:%d;Hlts:%d;Done:%d;Idle:%d;" "Colls:%d;Carr:%d;FIFO:%d;Abrt:%d;Wndw:%d;\n", - fTxInterrupts, fTransmitted, fDropped, fTxHalt, fTxDone, + fTxInterrupts, fTransmitted, fDropped, fTxHalt, fTxDone, fTxIdle, fCollisions, fCarrier, fFIFO, fTxAbort, fWindow); TRACE("RX:Ints:%d;Bts:%llu;Hlts:%d;Done:%d;Idle:%d;CRC:%d;Cln:%d;" "Nibon:%d;Ovrrn:%d;MIIErr:%d;Lmt:%d;Shrt:%d;Abrt:%d\n", - fRxInterrupts, fReceived, fRxHalt, fRxDone, fRxIdle, fCRC, fColon, + fRxInterrupts, fReceived, fRxHalt, fRxDone, fRxIdle, fCRC, fColon, fNibon, fOverrun, fMIIError, fLimit, fShort, fRxAbort); } diff --git a/src/add-ons/kernel/drivers/network/usb_asix/Settings.cpp b/src/add-ons/kernel/drivers/network/usb_asix/Settings.cpp index 5ac346e771..718065e9af 100644 --- a/src/add-ons/kernel/drivers/network/usb_asix/Settings.cpp +++ b/src/add-ons/kernel/drivers/network/usb_asix/Settings.cpp @@ -57,7 +57,7 @@ void load_settings() gAddTimeStamp = get_driver_boolean_parameter(handle, "add_timestamp", gAddTimeStamp, true); const char * logFilePath = get_driver_parameter(handle, "logfile", - NULL, "/var/log/"DRIVER_NAME".log"); + NULL, "/var/log/" DRIVER_NAME ".log"); if (logFilePath != NULL) { gLogFilePath = strdup(logFilePath); } @@ -84,7 +84,7 @@ void usb_asix_trace(bool force, const char* func, const char *fmt, ...) } va_list arg_list; - static const char *prefix = "\33[33m"DRIVER_NAME":\33[0m"; + static const char *prefix = "\33[33m" DRIVER_NAME ":\33[0m"; static char buffer[1024]; char *buf_ptr = buffer; if (gLogFilePath == NULL) { diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/Settings.cpp b/src/add-ons/kernel/drivers/network/usb_davicom/Settings.cpp index 3e46e946e1..876d046a43 100644 --- a/src/add-ons/kernel/drivers/network/usb_davicom/Settings.cpp +++ b/src/add-ons/kernel/drivers/network/usb_davicom/Settings.cpp @@ -63,7 +63,7 @@ load_settings() gAddTimeStamp = get_driver_boolean_parameter(handle, "add_timestamp", gAddTimeStamp, true); const char * logFilePath = get_driver_parameter(handle, - "logfile", NULL, "/var/log/"DRIVER_NAME".log"); + "logfile", NULL, "/var/log/" DRIVER_NAME ".log"); if (logFilePath != NULL) { gLogFilePath = strdup(logFilePath); } @@ -91,7 +91,7 @@ void usb_davicom_trace(bool force, const char* func, const char *fmt, ...) } va_list arg_list; - static const char *prefix = "\33[33m"DRIVER_NAME":\33[0m"; + static const char *prefix = "\33[33m" DRIVER_NAME ":\33[0m"; static char buffer[1024]; char *buf_ptr = buffer; if (gLogFilePath == NULL) {