linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve indent to match existing

Browse Source
This commit is contained in:
Douglas Clowes
2012-11-29 14:25:07 +11:00
parent f57fe9262e
commit d89a726a8a
1 changed files with 179 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
servlog.c
View File

@@ -246,7 +246,7 @@ int OpenVerifyLogFile()
char *pChar = NULL; char *pChar = NULL;
char fPath[1024]; char fPath[1024];
/* snprintf(fPath, 1023, "%s/", getenv("SICS_INIT_LOGPATH")); */ /* snprintf(fPath, 1023, "%s/", getenv("SICS_INIT_LOGPATH")); */
snprintf(fPath, 1023, "%s/", "../log"); snprintf(fPath, 1023, "%s/", "../log");
pChar = IFindOption(pSICSOptions, "LogFileBaseName"); pChar = IFindOption(pSICSOptions, "LogFileBaseName");
@@ -310,7 +310,7 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
/* switch file if too many lines */ /* switch file if too many lines */
if (iLineCount >= MAXLOG) { if (iLineCount >= MAXLOG) {
fprintf(fLogFile,"%s: <<<close logfile>>>\n", timestamp(NULL)); fprintf(fLogFile, "%s: <<<close logfile>>>\n", timestamp(NULL));
fclose(fLogFile); fclose(fLogFile);
fLogFile = NULL; fLogFile = NULL;
iFile++; iFile++;
@@ -321,21 +321,21 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
iLogUsable = OpenVerifyLogFile(); iLogUsable = OpenVerifyLogFile();
} }
if(1 == iLogUsable) if (1 == iLogUsable) {
{
if (iLineCount == 0) if (iLineCount == 0)
fprintf(fLogFile,"%s: <<<open logfile>>>\n", timestamp(NULL)); fprintf(fLogFile, "%s: <<<open logfile>>>\n", timestamp(NULL));
fprintf(fLogFile,"%s: ", timestamp(tp)); fprintf(fLogFile, "%s: ", timestamp(tp));
fprintf(fLogFile,"%s", pText); fprintf(fLogFile, "%s", pText);
if (text_len < 1 || pText[text_len - 1] != '\n') if (text_len < 1 || pText[text_len - 1] != '\n')
fprintf(fLogFile,"\n"); fprintf(fLogFile, "\n");
fflush(fLogFile); fflush(fLogFile);
iLineCount++; iLineCount++;
} }
} }
void SICSLogWriteTime(char *pText, OutCode eOut, struct timeval *tp) { void SICSLogWriteTime(char *pText, OutCode eOut, struct timeval *tp)
{
char buf[200]; char buf[200];
const char *cp = pText; const char *cp = pText;
int idx = 0; int idx = 0;
@@ -351,23 +351,19 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
buf[idx++] = '\0'; buf[idx++] = '\0';
SICSLogWriteFile(buf, eOut, tp); SICSLogWriteFile(buf, eOut, tp);
idx = 0; idx = 0;
} } else if (*cp == '\r') {
else if (*cp == '\r') {
buf[idx++] = '\\'; buf[idx++] = '\\';
buf[idx++] = 'r'; buf[idx++] = 'r';
} } else if (*cp == '\t') {
else if (*cp == '\t') {
buf[idx++] = '\\'; buf[idx++] = '\\';
buf[idx++] = 't'; buf[idx++] = 't';
} } else if (*cp < ' ' || *cp > '~') {
else if (*cp < ' ' || *cp > '~') {
const char hex[] = "0123456789ABCDEF"; const char hex[] = "0123456789ABCDEF";
buf[idx++] = '<'; buf[idx++] = '<';
buf[idx++] = hex[(*cp >> 4) & 0xF]; buf[idx++] = hex[(*cp >> 4) & 0xF];
buf[idx++] = hex[(*cp) & 0xF]; buf[idx++] = hex[(*cp) & 0xF];
buf[idx++] = '>'; buf[idx++] = '>';
} } else {
else {
buf[idx++] = *cp; buf[idx++] = *cp;
} }
cp++; cp++;
@@ -383,15 +379,18 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
buf[idx++] = '\0'; buf[idx++] = '\0';
SICSLogWriteFile(buf, eOut, tp); SICSLogWriteFile(buf, eOut, tp);
} }
} }
void SICSLogWrite(char *pText, OutCode eOut) { void SICSLogWrite(char *pText, OutCode eOut)
{
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
SICSLogWriteTime(pText, eOut, &tv); SICSLogWriteTime(pText, eOut, &tv);
} }
void SICSLogWriteHexTime(const char* text, int count, OutCode eOut, struct timeval *tp) { void SICSLogWriteHexTime(const char *text, int count, OutCode eOut,
struct timeval *tp)
{
const char hex[] = "0123456789ABCDEF"; const char hex[] = "0123456789ABCDEF";
char addr[20], left[80], right[80]; char addr[20], left[80], right[80];
char *lp = left; char *lp = left;
@@ -406,12 +405,13 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
if ((i & 0xF) == 0) { if ((i & 0xF) == 0) {
if (i > 0) { if (i > 0) {
char line[132]; char line[132];
snprintf(line, sizeof(line)-1, "%-6s: %-49s | %-17s |", addr, left, right); snprintf(line, sizeof(line) - 1, "%-6s: %-49s | %-17s |", addr,
left, right);
SICSLogWriteTime(line, eOut, tp); SICSLogWriteTime(line, eOut, tp);
} }
snprintf(addr, sizeof(addr)-1, "0x%04X", i); snprintf(addr, sizeof(addr) - 1, "0x%04X", i);
while (i >= 16 && i + 16 < count) { while (i >= 16 && i + 16 < count) {
if (memcmp(&text[i-16], &text[i], 16) != 0) if (memcmp(&text[i - 16], &text[i], 16) != 0)
break; break;
++duplicates; ++duplicates;
i += 16; i += 16;
@@ -419,24 +419,25 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
if (duplicates > 0) { if (duplicates > 0) {
if (duplicates > 1) { if (duplicates > 1) {
char line[132]; char line[132];
snprintf(line, sizeof(line)-1, "%-6s: ... (%d duplicates)", addr, duplicates); snprintf(line, sizeof(line) - 1, "%-6s: ... (%d duplicates)",
addr, duplicates);
SICSLogWriteTime(line, eOut, tp); SICSLogWriteTime(line, eOut, tp);
} } else {
else {
char line[132]; char line[132];
snprintf(line, sizeof(line)-1, "%-6s: %-49s | %-17s |", addr, left, right); snprintf(line, sizeof(line) - 1, "%-6s: %-49s | %-17s |", addr,
left, right);
SICSLogWriteTime(line, eOut, tp); SICSLogWriteTime(line, eOut, tp);
} }
duplicates = 0; duplicates = 0;
} }
snprintf(addr, sizeof(addr)-1, "0x%04X", i); snprintf(addr, sizeof(addr) - 1, "0x%04X", i);
lp = left; lp = left;
rp = right; rp = right;
} }
*lp++ = hex[(text[i] >> 4) & 0xF]; *lp++ = hex[(text[i] >> 4) & 0xF];
*lp++ = hex[(text[i]) & 0xF]; *lp++ = hex[(text[i]) & 0xF];
*lp++ = ' '; *lp++ = ' ';
if (text[i]>= ' ' && text[i] <= '~') if (text[i] >= ' ' && text[i] <= '~')
*rp++ = text[i]; *rp++ = text[i];
else else
*rp++ = '.'; *rp++ = '.';
@@ -449,19 +450,22 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
} }
if (i > 0) { if (i > 0) {
char line[132]; char line[132];
snprintf(line, sizeof(line)-1, "%-6s: %-49s | %-17s |", addr, left, right); snprintf(line, sizeof(line) - 1, "%-6s: %-49s | %-17s |", addr, left,
right);
SICSLogWriteTime(line, eOut, tp); SICSLogWriteTime(line, eOut, tp);
} }
} }
void SICSLogWriteHex(const char* text, int count, OutCode eOut) { void SICSLogWriteHex(const char *text, int count, OutCode eOut)
{
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
SICSLogWriteHexTime(text, count, eOut, &tv); SICSLogWriteHexTime(text, count, eOut, &tv);
} }
void SICSLogTimePrintf(OutCode eOut, struct timeval *tp, const char *fmt, ...) void SICSLogTimePrintf(OutCode eOut, struct timeval *tp, const char *fmt,
{ ...)
{
va_list ap; va_list ap;
char buf[256]; char buf[256];
char *dyn; char *dyn;
@@ -475,10 +479,10 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
/* we have probably a C99 conforming snprintf and /* we have probably a C99 conforming snprintf and
need a larger buffer need a larger buffer
*/ */
dyn = malloc(l+1); dyn = malloc(l + 1);
if (dyn != NULL) { if (dyn != NULL) {
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(dyn, l+1, fmt, ap); vsnprintf(dyn, l + 1, fmt, ap);
va_end(ap); va_end(ap);
SICSLogWriteTime(dyn, eOut, tp); SICSLogWriteTime(dyn, eOut, tp);
free(dyn); free(dyn);
@@ -487,10 +491,10 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
} }
SICSLogWriteTime(buf, eOut, tp); SICSLogWriteTime(buf, eOut, tp);
return; return;
} }
void SICSLogPrintf(OutCode eOut, const char *fmt, ...) void SICSLogPrintf(OutCode eOut, const char *fmt, ...)
{ {
va_list ap; va_list ap;
char buf[256]; char buf[256];
char *dyn; char *dyn;
@@ -504,10 +508,10 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
/* we have probably a C99 conforming snprintf and /* we have probably a C99 conforming snprintf and
need a larger buffer need a larger buffer
*/ */
dyn = malloc(l+1); dyn = malloc(l + 1);
if (dyn != NULL) { if (dyn != NULL) {
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(dyn, l+1, fmt, ap); vsnprintf(dyn, l + 1, fmt, ap);
va_end(ap); va_end(ap);
SICSLogWrite(dyn, eOut); SICSLogWrite(dyn, eOut);
free(dyn); free(dyn);
@@ -516,10 +520,11 @@ static void SICSLogWriteFile(char *pText, OutCode eOut, struct timeval *tp)
} }
SICSLogWrite(buf, eOut); SICSLogWrite(buf, eOut);
return; return;
} }
/* Test of the logging facilities */ /* Test of the logging facilities */
int testLogCmd(SConnection *pCon, SicsInterp *pInter, void *pData, int argc, char *argv[]) { int testLogCmd(SConnection *pCon, SicsInterp *pInter, void *pData,
int argc, char *argv[]) {
char lbuf[2048]; char lbuf[2048];
char sbuf[1000]; char sbuf[1000];
int i; int i;
@@ -529,17 +534,16 @@ int testLogCmd(SConnection *pCon, SicsInterp *pInter, void *pData, int argc, cha
SICSLogPrintf(eStatus, "Hexlog %d all zero bytes", sizeof(lbuf)); SICSLogPrintf(eStatus, "Hexlog %d all zero bytes", sizeof(lbuf));
SICSLogWriteHex(lbuf, sizeof(lbuf), eStatus); SICSLogWriteHex(lbuf, sizeof(lbuf), eStatus);
for (i = 0; i <= 128; ++i) for (i = 0; i <= 128; ++i)
sbuf[i] = sbuf[sizeof(sbuf)-1 - i] = i; sbuf[i] = sbuf[sizeof(sbuf) - 1 - i] = i;
sbuf[sizeof(sbuf)/2] = '!'; sbuf[sizeof(sbuf) / 2] = '!';
SICSLogPrintf(eStatus, "Hexlog %d mid space bytes", sizeof(sbuf)); SICSLogPrintf(eStatus, "Hexlog %d mid space bytes", sizeof(sbuf));
SICSLogWriteHex(sbuf, sizeof(sbuf), eStatus); SICSLogWriteHex(sbuf, sizeof(sbuf), eStatus);
for (i = 0; i < 1000; ++i) for (i = 0; i < 1000; ++i)
sbuf[i] = ' ' + (i % 96); sbuf[i] = ' ' + (i % 96);
sbuf[sizeof(sbuf)-1] = '\0'; sbuf[sizeof(sbuf) - 1] = '\0';
SICSLogWrite("Very long line 1000 bytes", eStatus); SICSLogWrite("Very long line 1000 bytes", eStatus);
SICSLogWrite(sbuf, eStatus); SICSLogWrite(sbuf, eStatus);
SCSendOK(pCon); SCSendOK(pCon);
return OKOK; return OKOK;
} }