]> code.citadel.org Git - citadel.git/blobdiff - libcitadel/lib/wildfire.c
* json doesn't need to escape singlequotes
[citadel.git] / libcitadel / lib / wildfire.c
index 9fe53faa2ea8def2a371c29c81fa1b938f62ce6e..6d6669034c3d5c9e8617dd710b59c9bd4e9bc480 100644 (file)
 
 
 ConstStr WF_MsgStrs[] = {
+       {HKEY("LOG")},
        {HKEY("INFO")},
        {HKEY("WARN")},
        {HKEY("ERROR")},
-       {HKEY("LOG")},
        {HKEY("TRACE")},
        {HKEY("EXCEPTION")}
 };
@@ -218,7 +218,7 @@ void WildFireInitBacktrace(const char *argvNull, int AddBaseFrameSkip)
        BaseFrames --;
        BaseFrames += AddBaseFrameSkip;
        strings = backtrace_symbols(stack_frames, size);
-       for (i = 0; i < size; i++) {
+       for (i = 1; i < size; i++) {
                if (strings != NULL){
                        ParseBacktrace(strings[i], Function, 
                                       FileName, 
@@ -258,9 +258,9 @@ void WildFireInitBacktrace(const char *argvNull, int AddBaseFrameSkip)
 }
 
 
-JsonValue *WildFireException(StrBuf *Message,
-                            const char *Filename, long FileLen,
+JsonValue *WildFireException(const char *Filename, long FileLen,
                             long LineNo,
+                            StrBuf *Message,
                             int StackOffset)
 {
        JsonValue *ExcClass;