i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quick bit of style cleanup, no functional change

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40867 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-03-08 15:22:46 +00:00
parent 3171a65bf8
commit d4167620d8
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Settings.cpp
+27 -25
View File
@@ -27,10 +27,10 @@ static char *gLogFilePath = NULL;
mutex gLogLock; mutex gLogLock;
static static
void create_log() void create_log()
{ {
if(gLogFilePath == NULL) if (gLogFilePath == NULL)
return; return;
int flags = O_WRONLY | O_CREAT | ((gTruncateLogFile) ? O_TRUNC : 0); int flags = O_WRONLY | O_CREAT | ((gTruncateLogFile) ? O_TRUNC : 0);
@@ -43,18 +43,20 @@ void create_log()
void load_settings() void load_settings()
{ {
void *handle = load_driver_settings(DRIVER_NAME); void *handle = load_driver_settings(DRIVER_NAME);
if(handle == 0) if (handle == 0)
return; return;
gTraceOn = get_driver_boolean_parameter(handle, "trace", gTraceOn, true); gTraceOn = get_driver_boolean_parameter(handle, "trace", gTraceOn, true);
gTraceFlow = get_driver_boolean_parameter(handle, "trace_flow", gTraceFlow, true); gTraceFlow = get_driver_boolean_parameter(handle, "trace_flow",
gTruncateLogFile = get_driver_boolean_parameter(handle, "truncate_logfile", gTraceFlow, true);
gTruncateLogFile, true); gTruncateLogFile = get_driver_boolean_parameter(handle, "truncate_logfile",
gAddTimeStamp = get_driver_boolean_parameter(handle, "add_timestamp", gTruncateLogFile, true);
gAddTimeStamp, true); gAddTimeStamp = get_driver_boolean_parameter(handle, "add_timestamp",
const char * logFilePath = get_driver_parameter(handle, "logfile", gAddTimeStamp, true);
NULL, "/var/log/"DRIVER_NAME".log"); const char * logFilePath = get_driver_parameter(handle, "logfile",
if(logFilePath != NULL) { NULL, "/var/log/"DRIVER_NAME".log");
if (logFilePath != NULL) {
gLogFilePath = strdup(logFilePath); gLogFilePath = strdup(logFilePath);
} }
@@ -66,7 +68,7 @@ void load_settings()
void release_settings() void release_settings()
{ {
if(gLogFilePath != NULL) { if (gLogFilePath != NULL) {
mutex_destroy(&gLogLock); mutex_destroy(&gLogLock);
free(gLogFilePath); free(gLogFilePath);
} }
@@ -75,7 +77,7 @@ void release_settings()
void usb_beceem_trace(bool force, const char* func, const char *fmt, ...) void usb_beceem_trace(bool force, const char* func, const char *fmt, ...)
{ {
if(!(force || gTraceOn)) { if (!(force || gTraceOn)) {
// return; // return;
} }
@@ -83,21 +85,21 @@ void usb_beceem_trace(bool force, const char* func, const char *fmt, ...)
static const char *prefix = "\33[33m"DRIVER_NAME":\33[0m"; static const char *prefix = "\33[33m"DRIVER_NAME":\33[0m";
static char buffer[1024]; static char buffer[1024];
char *buf_ptr = buffer; char *buf_ptr = buffer;
if(gLogFilePath == NULL){ if (gLogFilePath == NULL) {
strcpy(buffer, prefix); strcpy(buffer, prefix);
buf_ptr += strlen(prefix); buf_ptr += strlen(prefix);
} }
if(gAddTimeStamp) {
bigtime_t time = system_time();
uint32 msec = time / 1000;
uint32 sec = msec / 1000;
sprintf(buf_ptr, "%02ld.%02ld.%03ld:",
sec / 60, sec % 60, msec % 1000);
buf_ptr += strlen(buf_ptr);
}
if(func != NULL) { if (gAddTimeStamp) {
bigtime_t time = system_time();
uint32 msec = time / 1000;
uint32 sec = msec / 1000;
sprintf(buf_ptr, "%02ld.%02ld.%03ld:",
sec / 60, sec % 60, msec % 1000);
buf_ptr += strlen(buf_ptr);
}
if (func != NULL) {
sprintf(buf_ptr, "%s::", func); sprintf(buf_ptr, "%s::", func);
buf_ptr += strlen(buf_ptr); buf_ptr += strlen(buf_ptr);
} }
@@ -106,7 +108,7 @@ void usb_beceem_trace(bool force, const char* func, const char *fmt, ...)
vsprintf(buf_ptr, fmt, arg_list); vsprintf(buf_ptr, fmt, arg_list);
va_end(arg_list); va_end(arg_list);
if(gLogFilePath == NULL) { if (gLogFilePath == NULL) {
dprintf(buffer); dprintf(buffer);
return; return;
} }