diff --git a/golded3/gecmfd.cpp b/golded3/gecmfd.cpp index fc657c7..9bd0737 100644 --- a/golded3/gecmfd.cpp +++ b/golded3/gecmfd.cpp @@ -156,7 +156,7 @@ void Area::DelMsgs(GMsg* msg) { if ((areano != currno) && (areano >= 0)) { CopyMoveForward(true); - GFTRK(NULL); + GFTRK(0); return; } } @@ -253,7 +253,7 @@ void Area::DelMsgs(GMsg* msg) { HandleGEvent(EVTT_BREAKLOOP); - GFTRK(NULL); + GFTRK(0); } @@ -269,7 +269,7 @@ void TwitDeleteMsg(GMsg* msg) { AA->DeleteMsg(msg, reader_direction); HandleGEvent(EVTT_BREAKLOOP); - GFTRK(NULL); + GFTRK(0); } @@ -363,7 +363,7 @@ void CmfMsgs(GMsg* msg, bool torecycle) do_mode = MenuDomarks.Run(markstr); if (do_mode == MODE_DONT) { - GFTRK(NULL); + GFTRK(0); return; } } @@ -407,7 +407,7 @@ void CmfMsgs(GMsg* msg, bool torecycle) AA->Mark.ResetAll(); w_info(NULL); - GFTRK(NULL); + GFTRK(0); return; } @@ -430,7 +430,7 @@ void CmfMsgs(GMsg* msg, bool torecycle) destarea = AreaPick(pickstr, 6, &destarea); if(destarea == -1) { - GFTRK(NULL); + GFTRK(0); return; } @@ -453,7 +453,7 @@ void CmfMsgs(GMsg* msg, bool torecycle) AL.SetActiveAreaId(OrigArea); throw_free(AA->adat); AA->adat = orig_adat; - GFTRK(NULL); + GFTRK(0); return; } } @@ -667,7 +667,7 @@ void CmfMsgs(GMsg* msg, bool torecycle) w_info(NULL); - GFTRK(NULL); + GFTRK(0); } diff --git a/golded3/gedoit.cpp b/golded3/gedoit.cpp index 9bd83c7..ed5bcd3 100644 --- a/golded3/gedoit.cpp +++ b/golded3/gedoit.cpp @@ -354,7 +354,7 @@ Finish: prnfp.Fclose(); #endif - GFTRK(NULL); + GFTRK(0); } diff --git a/golded3/geedit.cpp b/golded3/geedit.cpp index bc1f99e..e2370e8 100644 --- a/golded3/geedit.cpp +++ b/golded3/geedit.cpp @@ -206,7 +206,7 @@ Line* IEclass::findfirstline() { while(_firstline->prev) _firstline = _firstline->prev; - GFTRK(NULL); + GFTRK(0); return _firstline; } @@ -227,7 +227,7 @@ void IEclass::getthisrow(Line* __currline) { thisrow++; } - GFTRK(NULL); + GFTRK(0); } @@ -246,7 +246,7 @@ void IEclass::gotorowcol(uint __col, uint __row) { ccol = __col; crow = __row; - GFTRK(NULL); + GFTRK(0); } @@ -446,7 +446,7 @@ void IEclass::dispstring(Line* line, uint __row) StyleCodeHighlight(_buf+endblock, __row, mincol+endblock, false, DEFATTR); } - GFTRK(NULL); + GFTRK(0); } #else // #if defined(GCFG_SPELL_INCLUDED) @@ -562,7 +562,7 @@ void IEclass::dispstring(const char* __string, uint __row, int attr, Line* line) else StyleCodeHighlight(_buf, __row, mincol, false, attr); - GFTRK(NULL); + GFTRK(0); } #endif // #if defined(GCFG_SPELL_INCLUDED) @@ -610,7 +610,7 @@ void IEclass::displine(Line* __line, uint __row) { dispstring(__line->txt.c_str(), __row, -1, __line); #endif - GFTRK(NULL); + GFTRK(0); } @@ -630,7 +630,7 @@ void IEclass::clreol(int __col, int __row) { if((uint)__col <= maxcol) editwin.fill(__row, __col, __row, maxcol, ' ', C_READW); - GFTRK(NULL); + GFTRK(0); } @@ -669,7 +669,7 @@ void IEclass::refresh(Line* __currline, uint __row) { } #endif - GFTRK(NULL); + GFTRK(0); } @@ -693,7 +693,7 @@ Line* IEclass::insertlinebelow(Line* __currline, const char* __text, long __batc Undo->PushItem(EDIT_UNDO_NEW_LINE|batch_mode|__batch_mode, _nextline); - GFTRK(NULL); + GFTRK(0); return _nextline; } @@ -717,7 +717,7 @@ int IEclass::downoneline(uint __row) { gotorowcol(mincol, __row); - GFTRK(NULL); + GFTRK(0); return __row; } @@ -740,7 +740,7 @@ void IEclass::GoEOL() { if(blockcol != -1) displine(currline, row); - GFTRK(NULL); + GFTRK(0); } @@ -775,7 +775,7 @@ void IEclass::GoUp() { GoEOL(); } - GFTRK(NULL); + GFTRK(0); } @@ -810,7 +810,7 @@ void IEclass::GoDown() { GoEOL(); } - GFTRK(NULL); + GFTRK(0); } @@ -836,7 +836,7 @@ void IEclass::GoLeft() { if(blockcol != -1) displine(currline, row); - GFTRK(NULL); + GFTRK(0); } @@ -860,7 +860,7 @@ void IEclass::GoRight() { if(blockcol != -1) displine(currline, row); - GFTRK(NULL); + GFTRK(0); } @@ -1175,7 +1175,7 @@ Line* IEclass::wrapit(Line** __currline, uint* __curr_col, uint* __curr_row, boo *__curr_row = _cursrow; *__curr_col = _curscol; - GFTRK(NULL); + GFTRK(0); return _lastadded; } @@ -1189,7 +1189,7 @@ Line* IEclass::wrapdel(Line** __currline, uint* __curr_col, uint* __curr_row, bo Line *tmp = wrapit(__currline, __curr_col, __curr_row, __display); - GFTRK(NULL); + GFTRK(0); return tmp; } @@ -1203,7 +1203,7 @@ Line* IEclass::wrapins(Line** __currline, uint* __curr_col, uint* __curr_row, bo Line *tmp = wrapit(__currline, __curr_col, __curr_row, __display); - GFTRK(NULL); + GFTRK(0); return tmp; } @@ -1270,7 +1270,7 @@ void IEclass::insertchar(char __ch) { gotorowcol(col, row); - GFTRK(NULL); + GFTRK(0); } @@ -1291,7 +1291,7 @@ void IEclass::DelChar() { batch_mode = BATCH_MODE; } else if(col and (col == _thislen) and _nextline) { - GFTRK(NULL); + GFTRK(0); if(not batch_mode) { Undo->PushItem(EDIT_UNDO_VOID); batch_mode = BATCH_MODE; @@ -1361,7 +1361,7 @@ void IEclass::DelChar() { refresh(_topline, minrow); } - GFTRK(NULL); + GFTRK(0); } @@ -1374,7 +1374,7 @@ void IEclass::DelLeft() { // Cannot backspace from the first column on the first line in the msg if(currline->prev == NULL) if(col == mincol) { - GFTRK(NULL); + GFTRK(0); return; } @@ -1389,7 +1389,7 @@ void IEclass::DelLeft() { GoLeft(); DelChar(); - GFTRK(NULL); + GFTRK(0); } @@ -1427,7 +1427,7 @@ void IEclass::GoWordLeft() { displine(currline, row); } - GFTRK(NULL); + GFTRK(0); } @@ -1472,7 +1472,7 @@ void IEclass::GoWordRight() { if (blockcol != -1) displine(currline, row); - GFTRK(NULL); + GFTRK(0); } @@ -1555,7 +1555,7 @@ void IEclass::Newline() { wrapdel(&currline, &col, &row, true); refresh(currline, row); - GFTRK(NULL); + GFTRK(0); } @@ -1575,7 +1575,7 @@ void IEclass::CopyAboveChar() { } insertchar(_ch); - GFTRK(NULL); + GFTRK(0); } @@ -1595,7 +1595,7 @@ void IEclass::DupLine() { refresh(currline, row); GoDown(); - GFTRK(NULL); + GFTRK(0); } @@ -1663,7 +1663,7 @@ void IEclass::GoPgUp() { if(col+1 > currline->txt.length()) GoEOL(); - GFTRK(NULL); + GFTRK(0); } @@ -1721,7 +1721,7 @@ void IEclass::GoPgDn() { if(col+1 > currline->txt.length()) GoEOL(); - GFTRK(NULL); + GFTRK(0); } @@ -1743,7 +1743,7 @@ void IEclass::Tab() { break; } while(col % tabsz); - GFTRK(NULL); + GFTRK(0); } @@ -1766,7 +1766,7 @@ void IEclass::ReTab() { GoLeft(); } while(col % tabsz); - GFTRK(NULL); + GFTRK(0); } @@ -1789,7 +1789,7 @@ void IEclass::DeleteEOL() { clreol(); - GFTRK(NULL); + GFTRK(0); } @@ -1800,7 +1800,7 @@ void IEclass::DeleteSOL() { GFTRK("EditDeleteSOL"); if(col == 0) { - GFTRK(NULL); + GFTRK(0); return; } @@ -1813,7 +1813,7 @@ void IEclass::DeleteSOL() { wrapdel(&currline, &col, &row); - GFTRK(NULL); + GFTRK(0); } @@ -1896,7 +1896,7 @@ void IEclass::deleteline(bool zapquotesbelow) { // Refresh display from cursor row refresh(currline, row); - GFTRK(NULL); + GFTRK(0); } @@ -1946,7 +1946,7 @@ void IEclass::UnDelete(bool before) { refresh(currline, row); } - GFTRK(NULL); + GFTRK(0); } @@ -1968,7 +1968,7 @@ void IEclass::ZapQuoteBelow() { item_to_fix->line = currline; } - GFTRK(NULL); + GFTRK(0); } @@ -1986,7 +1986,7 @@ Line* IEclass::findtopline() { _toprow--; } - GFTRK(NULL); + GFTRK(0); return _topline; } @@ -2052,7 +2052,7 @@ void IEclass::savefile(int __status) { cursoron(); #endif - GFTRK(NULL); + GFTRK(0); } @@ -2064,7 +2064,7 @@ void IEclass::SaveFile() { savefile(MODE_UPDATE); - GFTRK(NULL); + GFTRK(0); } @@ -2076,7 +2076,7 @@ void IEclass::SaveMsg() { done = MODE_SAVE; - GFTRK(NULL); + GFTRK(0); } @@ -2197,7 +2197,7 @@ void IEclass::Reflow() { GoDown(); } else { - GFTRK(NULL); + GFTRK(0); return; } } @@ -2245,7 +2245,7 @@ void IEclass::Reflow() { GoDown(); col = mincol; - GFTRK(NULL); + GFTRK(0); } @@ -2257,7 +2257,7 @@ void IEclass::ExitMsg() { done = MODE_QUIT; - GFTRK(NULL); + GFTRK(0); } @@ -2270,7 +2270,7 @@ void IEclass::DelLine() { cursoroff(); deleteline(); - GFTRK(NULL); + GFTRK(0); } @@ -2285,7 +2285,7 @@ void IEclass::ToUpper() { currline->txt[col] = g_toupper(currline->txt[col]); } - GFTRK(NULL); + GFTRK(0); } @@ -2300,7 +2300,7 @@ void IEclass::ToLower() { currline->txt[col] = g_tolower(currline->txt[col]); } - GFTRK(NULL); + GFTRK(0); } @@ -2321,7 +2321,7 @@ void IEclass::ToggleCase() { currline->txt[col] = g_toupper(chr); } - GFTRK(NULL); + GFTRK(0); } @@ -2448,7 +2448,7 @@ void IEclass::ToggleCaseBlock(gkey key) Line* _topline = findtopline(); refresh(_topline, minrow); - GFTRK(NULL); + GFTRK(0); } @@ -2488,7 +2488,7 @@ void IEclass::SCodeChange(gkey key) GoLeft(); } - GFTRK(NULL); + GFTRK(0); return; } } @@ -2507,7 +2507,7 @@ void IEclass::SCodeChange(gkey key) if ((_ch == c1) && (c1 == c2)) { - GFTRK(NULL); + GFTRK(0); return; } @@ -2532,7 +2532,7 @@ void IEclass::SCodeChange(gkey key) GoLeft(); - GFTRK(NULL); + GFTRK(0); } @@ -2544,7 +2544,7 @@ void IEclass::LookupCursor() { LookupNode(msgptr, currline->txt.c_str()+col, LOOK_NAME); - GFTRK(NULL); + GFTRK(0); } @@ -2556,7 +2556,7 @@ void IEclass::LookupDest() { LookupNode(msgptr, "", LOOK_DEST); - GFTRK(NULL); + GFTRK(0); } @@ -2568,7 +2568,7 @@ void IEclass::LookupOrig() { LookupNode(msgptr, "", LOOK_ORIG); - GFTRK(NULL); + GFTRK(0); } @@ -3047,7 +3047,7 @@ int IEclass::Start(int __mode, uint* __position, GMsg* __msg) { *__position = 1 + thisrow; - GFTRK(NULL); + GFTRK(0); return done; } @@ -3178,7 +3178,7 @@ void UndoStack::PushItem(uint action, Line* __line, uint __col, uint __len) { } } - GFTRK(NULL); + GFTRK(0); } @@ -3422,7 +3422,7 @@ void UndoStack::PlayItem() { undo_ready = YES; } - GFTRK(NULL); + GFTRK(0); } diff --git a/golded3/geedit2.cpp b/golded3/geedit2.cpp index a745a8b..4718aa9 100644 --- a/golded3/geedit2.cpp +++ b/golded3/geedit2.cpp @@ -186,7 +186,7 @@ void IEclass::ClearDeleteBuf() { killkillbuf(); HandleGEvent(EVTT_JOBDONE); - GFTRK(NULL); + GFTRK(0); } @@ -199,7 +199,7 @@ void IEclass::ClearPasteBuf() { killpastebuf(); HandleGEvent(EVTT_JOBDONE); - GFTRK(NULL); + GFTRK(0); } @@ -214,7 +214,7 @@ void IEclass::GoBegLine() { if(blockcol != -1) displine(currline, row); - GFTRK(NULL); + GFTRK(0); } @@ -226,7 +226,7 @@ void IEclass::DelLtWord() { if(col == 0) { DelLeft(); - GFTRK(NULL); + GFTRK(0); return; } @@ -254,7 +254,7 @@ void IEclass::DelLtWord() { } else { DelLeft(); - GFTRK(NULL); + GFTRK(0); return; } @@ -265,7 +265,7 @@ void IEclass::DelLtWord() { wrapdel(&currline, &col, &row); - GFTRK(NULL); + GFTRK(0); } @@ -277,7 +277,7 @@ void IEclass::DelRtWord() { if((currline->txt.length() == col+1) or (currline->txt[col+1] == '\n')) { DelChar(); - GFTRK(NULL); + GFTRK(0); return; } @@ -301,7 +301,7 @@ void IEclass::DelRtWord() { } else { DelChar(); - GFTRK(NULL); + GFTRK(0); return; } @@ -310,7 +310,7 @@ void IEclass::DelRtWord() { wrapdel(&currline, &col, &row); - GFTRK(NULL); + GFTRK(0); } @@ -326,7 +326,7 @@ void IEclass::GoTopMsg() { thisrow = 0; refresh(currline, minrow); - GFTRK(NULL); + GFTRK(0); } @@ -362,7 +362,7 @@ void IEclass::GoBotMsg() { // Refresh the display refresh(_topline, minrow); - GFTRK(NULL); + GFTRK(0); } @@ -385,7 +385,7 @@ void IEclass::GoTopLine() { if(blockcol != -1) refresh(currline, minrow); - GFTRK(NULL); + GFTRK(0); } @@ -409,7 +409,7 @@ void IEclass::GoBotLine() { if(blockcol != -1) refresh(_oldcurrline, _oldrow); - GFTRK(NULL); + GFTRK(0); } @@ -426,7 +426,7 @@ Line* IEclass::findanchor() { while(not (_anchor->type & GLINE_BLOK) and _anchor->next) _anchor = _anchor->next; - GFTRK(NULL); + GFTRK(0); // Return pointer to the anchor line or NULL if no anchor was found return (_anchor->type & GLINE_BLOK) ? _anchor : (Line*)NULL; @@ -485,7 +485,7 @@ void IEclass::BlockAnchor() { displine(currline, row); - GFTRK(NULL); + GFTRK(0); } @@ -590,7 +590,7 @@ void IEclass::BlockCopy() { } killpastebuf(); - GFTRK(NULL); + GFTRK(0); } @@ -691,7 +691,7 @@ void IEclass::BlockDel(Line* anchor) { selecting = NO; - GFTRK(NULL); + GFTRK(0); } @@ -719,7 +719,7 @@ void IEclass::BlockCut(bool just_delete) { else killpastebuf(); - GFTRK(NULL); + GFTRK(0); } @@ -787,7 +787,7 @@ void IEclass::BlockPaste() { refresh(_topline, minrow); } - GFTRK(NULL); + GFTRK(0); } @@ -880,7 +880,7 @@ void IEclass::LoadFile() { throw_new(Undo = new UndoStack(this)); } - GFTRK(NULL); + GFTRK(0); } @@ -1227,7 +1227,7 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) { AA->SetXlatimport(__oldxlatimport); - GFTRK(NULL); + GFTRK(0); } @@ -1242,7 +1242,7 @@ void IEclass::imptxt(char* __filename, bool imptxt) { refresh(currline, row); col = mincol; - GFTRK(NULL); + GFTRK(0); } @@ -1254,7 +1254,7 @@ void IEclass::ImportText() { imptxt(NULL); - GFTRK(NULL); + GFTRK(0); } @@ -1269,7 +1269,7 @@ void IEclass::ImportQuotebuf() { GetCurrQuotebuf(_quotebuf); imptxt(_quotebuf, true); - GFTRK(NULL); + GFTRK(0); } @@ -1306,7 +1306,7 @@ void IEclass::editexport(Line* __exportline, int __endat) { } } - GFTRK(NULL); + GFTRK(0); } @@ -1328,7 +1328,7 @@ void IEclass::SpellCheck() ShellToDos(_buf, _buf2, LGREY_|_BLACK, YES); LoadFile(); - GFTRK(NULL); + GFTRK(0); } @@ -1348,7 +1348,7 @@ void IEclass::ExportText() { editexport(exportline, endat); - GFTRK(NULL); + GFTRK(0); } @@ -1362,7 +1362,7 @@ void IEclass::DosShell() { cursoron(); cursoroff(); - GFTRK(NULL); + GFTRK(0); } @@ -1382,7 +1382,7 @@ void IEclass::dispins() { HeaderView->window.printvs(5, MAXCOL-6, C_HEADB|ACSET, _lbuf); } - GFTRK(NULL); + GFTRK(0); } @@ -1405,7 +1405,7 @@ void IEclass::dispdl() HeaderView->window.printvs(5, MAXCOL-12, C_HEADB|ACSET, _lbuf); } - GFTRK(NULL); + GFTRK(0); } @@ -1418,7 +1418,7 @@ void IEclass::ToggleInsert() { insert = not insert; dispins(); - GFTRK(NULL); + GFTRK(0); } @@ -1437,7 +1437,7 @@ void IEclass::ToggleDrawLines() dispdl(); - GFTRK(NULL); + GFTRK(0); } @@ -1898,7 +1898,7 @@ void IEclass::DrawLines(gkey key) } } - GFTRK(NULL); + GFTRK(0); } @@ -1912,7 +1912,7 @@ void IEclass::Header() { EditHeaderinfo(msgmode, *HeaderView); windowopen(); - GFTRK(NULL); + GFTRK(0); } @@ -1928,7 +1928,7 @@ void IEclass::Abort() { done = MODE_QUIT; } - GFTRK(NULL); + GFTRK(0); } @@ -1949,7 +1949,7 @@ void IEclass::AskExit() { done = MODE_SAVE; } - GFTRK(NULL); + GFTRK(0); } @@ -1963,7 +1963,7 @@ void IEclass::QuitNow() { done = CFG->switches.get(timeoutsavemsg) ? MODE_SAVE : MODE_QUIT; gkbd.quitall = YES; - GFTRK(NULL); + GFTRK(0); } diff --git a/golded3/gefile.cpp b/golded3/gefile.cpp index ded613a..7fb7439 100644 --- a/golded3/gefile.cpp +++ b/golded3/gefile.cpp @@ -1071,7 +1071,7 @@ void FileRequest(GMsg* msg) { reader_topline = oldtopline; reader_keyok = YES; - GFTRK(NULL); + GFTRK(0); } diff --git a/golded3/gefind.cpp b/golded3/gefind.cpp index 21952cd..7126124 100644 --- a/golded3/gefind.cpp +++ b/golded3/gefind.cpp @@ -192,7 +192,7 @@ bool FindString(GMsg* msg, const char* prompt, int what) { w_info(NULL); } - GFTRK(NULL); + GFTRK(0); return result; } diff --git a/golded3/gemrks.cpp b/golded3/gemrks.cpp index 50aa2a9..d3499ba 100644 --- a/golded3/gemrks.cpp +++ b/golded3/gemrks.cpp @@ -363,7 +363,7 @@ void MarkMsgs(GMsg* msg) { break; } - GFTRK(NULL); + GFTRK(0); } diff --git a/golded3/gepost.cpp b/golded3/gepost.cpp index 23c4e91..fca2042 100644 --- a/golded3/gepost.cpp +++ b/golded3/gepost.cpp @@ -1249,7 +1249,7 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) { LoadLanguage(AA->Loadlanguage()); - GFTRK(NULL); + GFTRK(0); } diff --git a/golded3/geread.cpp b/golded3/geread.cpp index 1ae6a08..ac3fcae 100644 --- a/golded3/geread.cpp +++ b/golded3/geread.cpp @@ -1221,7 +1221,7 @@ int LoadMessage(GMsg* msg, int margin) { msg->txt = throw_strdup(""); } - GFTRK(NULL); + GFTRK(0); return true; } diff --git a/goldlib/gall/gdbgtrk.h b/goldlib/gall/gdbgtrk.h index 3984c7f..360c3b4 100644 --- a/goldlib/gall/gdbgtrk.h +++ b/goldlib/gall/gdbgtrk.h @@ -56,8 +56,10 @@ extern GFTrk* __gftrk_list; // ------------------------------------------------------------------ #if defined(GFTRK_ENABLE) -#ifdef __GNUC__ +#if defined(__GNUC__) #define GFTRK(t) if(__gftrk) __gftrk_track(t ? __PRETTY_FUNCTION__ : t); +#elif defined(_MSC_VER) && defined(__FUNCSIG__) +#define GFTRK(t) if(__gftrk) __gftrk_track(t ? __FUNCSIG__ : t); #else #define GFTRK(t) if(__gftrk) __gftrk_track(t); #endif diff --git a/goldlib/glibc/regex.cpp b/goldlib/glibc/regex.cpp index d0ea153..2230c32 100644 --- a/goldlib/glibc/regex.cpp +++ b/goldlib/glibc/regex.cpp @@ -200,7 +200,7 @@ init_syntax_once () # endif /* not SYNTAX_TABLE */ -# define SYNTAX(c) re_syntax_table[c] +# define SYNTAX(c) re_syntax_table[c & 0xFF] #endif /* not emacs */ diff --git a/goldlib/gmb3/gmoezyc1.cpp b/goldlib/gmb3/gmoezyc1.cpp index c2fb0be..2bf730f 100644 --- a/goldlib/gmb3/gmoezyc1.cpp +++ b/goldlib/gmb3/gmoezyc1.cpp @@ -109,7 +109,7 @@ void EzycomArea::raw_close() { if(data->omode == O_WRONLY) remove(AddPath(wide->msgbasepath, "EZYMSG.NOW")); - GFTRK(NULL); + GFTRK(0); } @@ -145,7 +145,7 @@ int EzycomArea::test_open(const char* __file, int __mode, int __share) { if(_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); return _fh; } @@ -183,7 +183,7 @@ int EzycomArea::raw_open() { write(data->fhnow, &_sema, 1); // Write some dummy data } - GFTRK(NULL); + GFTRK(0); return true; } } @@ -199,7 +199,7 @@ int EzycomArea::raw_open() { } } while(_tryagain == 1); - GFTRK(NULL); + GFTRK(0); return false; } @@ -237,7 +237,7 @@ void EzycomArea::test_raw_open(int __fileline) { if(_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); } @@ -353,7 +353,7 @@ void EzycomArea::open() { scan(); } - GFTRK(NULL); + GFTRK(0); } @@ -384,7 +384,7 @@ void EzycomArea::save_lastread() { } } - GFTRK(NULL); + GFTRK(0); } @@ -415,7 +415,7 @@ void EzycomArea::close() { TestErrorExit(); } - GFTRK(NULL); + GFTRK(0); } @@ -428,7 +428,7 @@ void EzycomArea::suspend() { save_lastread(); raw_close(); - GFTRK(NULL); + GFTRK(0); } @@ -446,7 +446,7 @@ void EzycomArea::resume() { OpenErrorExit(); } - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmoezyc2.cpp b/goldlib/gmb3/gmoezyc2.cpp index b5fa8ee..1fb3b63 100644 --- a/goldlib/gmb3/gmoezyc2.cpp +++ b/goldlib/gmb3/gmoezyc2.cpp @@ -119,7 +119,7 @@ void EzycomArea::raw_scan(int __keep_index) { isopen--; } - GFTRK(NULL); + GFTRK(0); } @@ -131,7 +131,7 @@ void EzycomArea::scan() { raw_scan(true); - GFTRK(NULL); + GFTRK(0); } @@ -143,7 +143,7 @@ void EzycomArea::scan_area() { raw_scan(false); - GFTRK(NULL); + GFTRK(0); } @@ -155,7 +155,7 @@ void EzycomArea::scan_area_pm() { scan_area(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmoezyc3.cpp b/goldlib/gmb3/gmoezyc3.cpp index c888643..cb31ad2 100644 --- a/goldlib/gmb3/gmoezyc3.cpp +++ b/goldlib/gmb3/gmoezyc3.cpp @@ -100,7 +100,7 @@ int EzycomArea::load_message(int __mode, gmsg* __msg, EzycHdr& __hdr) { read(data->fhtxt, __msg->txt, (uint)__hdr.messagelength); } - GFTRK(NULL); + GFTRK(0); return true; } diff --git a/goldlib/gmb3/gmoezyc4.cpp b/goldlib/gmb3/gmoezyc4.cpp index 52226d9..fd181b9 100644 --- a/goldlib/gmb3/gmoezyc4.cpp +++ b/goldlib/gmb3/gmoezyc4.cpp @@ -44,7 +44,7 @@ void EzycomArea::lock() { test_raw_open(__LINE__); data->islocked = true; - GFTRK(NULL); + GFTRK(0); } @@ -60,7 +60,7 @@ void EzycomArea::unlock() { test_raw_open(__LINE__); data->islocked = false; - GFTRK(NULL); + GFTRK(0); } @@ -241,7 +241,7 @@ void EzycomArea::save_message(int __mode, gmsg* __msg, EzycHdr& __hdr) { if(not _was_locked) unlock(); - GFTRK(NULL); + GFTRK(0); } @@ -286,7 +286,7 @@ void EzycomArea::new_msgno(gmsg* __msg) { __msg->msgno = (filelength(data->fhhdr) / sizeof(EzycHdr)) + 1; - GFTRK(NULL); + GFTRK(0); } @@ -309,7 +309,7 @@ void EzycomArea::update_timesread(gmsg* msg) { unlock(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmoezyc5.cpp b/goldlib/gmb3/gmoezyc5.cpp index a816969..2014cf4 100644 --- a/goldlib/gmb3/gmoezyc5.cpp +++ b/goldlib/gmb3/gmoezyc5.cpp @@ -104,7 +104,7 @@ Line* EzycomArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head) { HexDump16(buf+7, _ptr, sizeof(EzycHdr)%16, HEX_DUMP2); line = AddLine(line, buf); - GFTRK(NULL); + GFTRK(0); return line; } diff --git a/goldlib/gmb3/gmofido1.cpp b/goldlib/gmb3/gmofido1.cpp index 37fc272..4f63aef 100644 --- a/goldlib/gmb3/gmofido1.cpp +++ b/goldlib/gmb3/gmofido1.cpp @@ -84,7 +84,7 @@ int FidoArea::test_open(const char* __file, int __openmode, int __sharemode, int // Return instead of halting if requested if((errno != EACCES) and not __fail) { - GFTRK(NULL); + GFTRK(0); return _fh; } @@ -102,7 +102,7 @@ int FidoArea::test_open(const char* __file, int __openmode, int __sharemode, int if(_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); return _fh; } @@ -190,7 +190,7 @@ void FidoArea::open() { scan(); } - GFTRK(NULL); + GFTRK(0); } @@ -208,7 +208,7 @@ void FidoArea::save_lastread() { ::close(_fh); } - GFTRK(NULL); + GFTRK(0); } @@ -238,7 +238,7 @@ void FidoArea::close() { TestErrorExit(); } - GFTRK(NULL); + GFTRK(0); } @@ -250,7 +250,7 @@ void FidoArea::suspend() { save_lastread(); - GFTRK(NULL); + GFTRK(0); } @@ -260,7 +260,7 @@ void FidoArea::resume() { GFTRK("FidoResume"); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmofido2.cpp b/goldlib/gmb3/gmofido2.cpp index 0b197eb..e498e8f 100644 --- a/goldlib/gmb3/gmofido2.cpp +++ b/goldlib/gmb3/gmofido2.cpp @@ -206,7 +206,7 @@ void FidoArea::raw_scan(bool __scanpm) { isopen--; } - GFTRK(NULL); + GFTRK(0); } @@ -218,7 +218,7 @@ void FidoArea::scan() { scan_area(); - GFTRK(NULL); + GFTRK(0); } @@ -235,7 +235,7 @@ void FidoArea::scan_area() { if(not was_open) data_close(); - GFTRK(NULL); + GFTRK(0); } @@ -252,7 +252,7 @@ void FidoArea::scan_area_pm() { if(not was_open) data_close(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmofido3.cpp b/goldlib/gmb3/gmofido3.cpp index 4141e3a..bf28c44 100644 --- a/goldlib/gmb3/gmofido3.cpp +++ b/goldlib/gmb3/gmofido3.cpp @@ -43,7 +43,7 @@ int FidoArea::load_message(int __mode, gmsg* __msg, FidoHdr& __hdr) { // Open the message file int _fh = test_open(_msgfile, O_RDONLY|O_BINARY, WideSharemode); if(_fh == -1) { - GFTRK(NULL); + GFTRK(0); return false; } @@ -164,7 +164,7 @@ int FidoArea::load_message(int __mode, gmsg* __msg, FidoHdr& __hdr) { // Close the message file ::close(_fh); - GFTRK(NULL); + GFTRK(0); // Success return true; diff --git a/goldlib/gmb3/gmofido4.cpp b/goldlib/gmb3/gmofido4.cpp index 270c5ec..a217007 100644 --- a/goldlib/gmb3/gmofido4.cpp +++ b/goldlib/gmb3/gmofido4.cpp @@ -42,7 +42,7 @@ void FidoArea::lock() { GFTRK("FidoLock"); - GFTRK(NULL); + GFTRK(0); } @@ -52,7 +52,7 @@ void FidoArea::unlock() { GFTRK("FidoUnlock"); - GFTRK(NULL); + GFTRK(0); } @@ -94,7 +94,7 @@ void FidoArea::save_message(int __mode, gmsg* __msg, FidoHdr& __hdr) { chmod(_msgfile, S_STDRW); remove(_msgfile); } - GFTRK(NULL); + GFTRK(0); return; } @@ -207,7 +207,7 @@ void FidoArea::save_message(int __mode, gmsg* __msg, FidoHdr& __hdr) { Msgn->Append(__msg->msgno); } - GFTRK(NULL); + GFTRK(0); } @@ -256,7 +256,7 @@ void FidoArea::new_msgno(gmsg* __msg) { __msg->msgno = Msgn->CvtReln(Msgn->Count()) + (++n); } while(fexist(build_msgname(_buf, __msg->msgno))); - GFTRK(NULL); + GFTRK(0); } @@ -295,7 +295,7 @@ void FidoArea::update_timesread(gmsg* msg) { if(readonly) chmod(filename,S_STDRD); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmofido5.cpp b/goldlib/gmb3/gmofido5.cpp index e9a1911..4fb0540 100644 --- a/goldlib/gmb3/gmofido5.cpp +++ b/goldlib/gmb3/gmofido5.cpp @@ -131,7 +131,7 @@ int FidoArea::renumber() { for(_count=0; _countCount(); _count++) Msgn->at(_count) = _count + _msgno1st; - GFTRK(NULL); + GFTRK(0); return true; } @@ -188,7 +188,7 @@ Line* FidoArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head) { HexDump16(buf+7, _ptr, 14, HEX_DUMP2); line = AddLine(line, buf); - GFTRK(NULL); + GFTRK(0); return line; } diff --git a/goldlib/gmb3/gmohuds1.cpp b/goldlib/gmb3/gmohuds1.cpp index 4ba32b7..14c8d72 100644 --- a/goldlib/gmb3/gmohuds1.cpp +++ b/goldlib/gmb3/gmohuds1.cpp @@ -232,7 +232,7 @@ void _HudsWide::init() { if(WideDebug) WideLog->printf("- End init for %s.", path); - GFTRK(NULL); + GFTRK(0); } @@ -259,7 +259,7 @@ void _HudsWide::save_lastread( timesposted = 0; } - GFTRK(NULL); + GFTRK(0); } @@ -299,7 +299,7 @@ error: TestErrorExit(); done: - GFTRK(NULL); + GFTRK(0); } @@ -347,7 +347,7 @@ error: done: data_close(); - GFTRK(NULL); + GFTRK(0); } @@ -361,7 +361,7 @@ void _HudsArea::suspend() { wide->save_lastread((board_t)board(), (msgn_t)Msgn->CvtReln(lastread)); wide->raw_close(); - GFTRK(NULL); + GFTRK(0); } @@ -374,7 +374,7 @@ void _HudsArea::resume() { wide->raw_open(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmohuds2.cpp b/goldlib/gmb3/gmohuds2.cpp index f5e1fb4..c681673 100644 --- a/goldlib/gmb3/gmohuds2.cpp +++ b/goldlib/gmb3/gmohuds2.cpp @@ -41,7 +41,7 @@ void _HudsWide::raw_close() fhtoi.Close(); fhusr.Close(); - GFTRK(NULL); + GFTRK(0); } @@ -97,7 +97,7 @@ void _HudsWide::test_open(gfil if (_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); } @@ -119,7 +119,7 @@ void _HudsWide::raw_open(int _ test_open(fhusr, __HUDSON ? "users" HUDS_EXT : "users" GOLD_EXT, __oaccess); } - GFTRK(NULL); + GFTRK(0); } @@ -132,7 +132,7 @@ void _HudsWide::raw_open_scan( raw_open(0, false); - GFTRK(NULL); + GFTRK(0); } @@ -159,7 +159,7 @@ void _HudsWide::refresh() { fhlrd.LseekSet(userno*sizeof(HudsLast)); fhlrd.Read(lastrec, sizeof(HudsLast)); - GFTRK(NULL); + GFTRK(0); } @@ -177,7 +177,7 @@ void _HudsWide::open() { raw_open_scan(); lock(); - GFTRK(NULL); + GFTRK(0); } @@ -196,7 +196,7 @@ void _HudsWide::close() { iswideopen = false; isopen = 0; - GFTRK(NULL); + GFTRK(0); } @@ -241,7 +241,7 @@ void _HudsWide::lock() { // Refresh msgbase data refresh(); - GFTRK(NULL); + GFTRK(0); } @@ -258,7 +258,7 @@ void _HudsWide::unlock() { islocked = false; } - GFTRK(NULL); + GFTRK(0); } @@ -391,7 +391,7 @@ void _HudsWide::scan() { _scan++; } - GFTRK(NULL); + GFTRK(0); } @@ -520,7 +520,7 @@ void _HudsArea::raw_scan(int _ wide->close(); } - GFTRK(NULL); + GFTRK(0); } @@ -533,7 +533,7 @@ void _HudsArea::scan() { raw_scan(true); - GFTRK(NULL); + GFTRK(0); } @@ -546,7 +546,7 @@ void _HudsArea::scan_area() { raw_scan(false); - GFTRK(NULL); + GFTRK(0); } @@ -655,7 +655,7 @@ void _HudsWide::scan_pm() { WideLog->printf("+ Advice: Run a msgbase index rebuild/recover utility."); } - GFTRK(NULL); + GFTRK(0); } @@ -721,7 +721,7 @@ void _HudsArea::scan_area_pm() WideLog->printf("- Oops! Fell into empty bracket."); } - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmohuds3.cpp b/goldlib/gmb3/gmohuds3.cpp index b5cb3c9..d73161f 100644 --- a/goldlib/gmb3/gmohuds3.cpp +++ b/goldlib/gmb3/gmohuds3.cpp @@ -41,7 +41,7 @@ msgn_t _HudsArea::get_hdr_idx( if(_msgidx_ptr) { while(_count <= _total) { if(_msgno == _msgidx_ptr->msgno) { - GFTRK(NULL); + GFTRK(0); return _count; } _msgidx_ptr++; @@ -79,7 +79,7 @@ msgn_t _HudsArea::get_hdr_idx( WideLog->printf("+ Advice: Restart or run a msgbase index rebuild utility."); IndexErrorExit(); - GFTRK(NULL); + GFTRK(0); return (msgn_t)(__HUDSON ? HUDS_DELETEDMSGNO : GOLD_DELETEDMSGNO); } @@ -91,7 +91,7 @@ template ::load_message(int __mode, gmsg* __msg, HudsHdr& __hdr) { if(__msg->msgno == 0) { - GFTRK(NULL); + GFTRK(0); return false; } @@ -201,7 +201,7 @@ int _HudsArea::load_message(in } } - GFTRK(NULL); + GFTRK(0); return true; } diff --git a/goldlib/gmb3/gmohuds4.cpp b/goldlib/gmb3/gmohuds4.cpp index 2226a6b..55764d8 100644 --- a/goldlib/gmb3/gmohuds4.cpp +++ b/goldlib/gmb3/gmohuds4.cpp @@ -101,7 +101,7 @@ void _HudsWide::update_netecho // Free the memory throw_free(_scanidx); - GFTRK(NULL); + GFTRK(0); } @@ -300,7 +300,7 @@ void _HudsArea::save_message(i if(not _was_locked) unlock(); - GFTRK(NULL); + GFTRK(0); } @@ -349,7 +349,7 @@ void _HudsArea::new_msgno(gmsg __msg->msgno = wide->msginfo.high + 1; - GFTRK(NULL); + GFTRK(0); } @@ -375,7 +375,7 @@ void _HudsArea::update_timesre unlock(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmohuds5.cpp b/goldlib/gmb3/gmohuds5.cpp index 01951d1..39eea58 100644 --- a/goldlib/gmb3/gmohuds5.cpp +++ b/goldlib/gmb3/gmohuds5.cpp @@ -128,7 +128,7 @@ Line* _HudsArea::make_dump_msg HexDump16(buf+7, _ptr, sizeof(HudsHdr)%16, HEX_DUMP2); line = AddLine(line, buf); - GFTRK(NULL); + GFTRK(0); return line; } diff --git a/goldlib/gmb3/gmojamm1.cpp b/goldlib/gmb3/gmojamm1.cpp index b6e9677..d5c2fd3 100644 --- a/goldlib/gmb3/gmojamm1.cpp +++ b/goldlib/gmb3/gmojamm1.cpp @@ -73,7 +73,7 @@ void JamInit(const char* jampath, int harddelete, int jamsmapihw) { // Enable replies lookahead feature jamwide->lookreplies = true; - GFTRK(NULL); + GFTRK(0); } @@ -106,7 +106,7 @@ void JamArea::open() { scan(); } - GFTRK(NULL); + GFTRK(0); } @@ -151,7 +151,7 @@ void JamArea::save_lastread() { // Unlock area unlock(); - GFTRK(NULL); + GFTRK(0); } @@ -185,7 +185,7 @@ void JamArea::close() { TestErrorExit(); } - GFTRK(NULL); + GFTRK(0); } @@ -198,7 +198,7 @@ void JamArea::suspend() { save_lastread(); raw_close(); - GFTRK(NULL); + GFTRK(0); } @@ -210,7 +210,7 @@ void JamArea::resume() { raw_open(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmojamm2.cpp b/goldlib/gmb3/gmojamm2.cpp index 2e68609..d217d83 100644 --- a/goldlib/gmb3/gmojamm2.cpp +++ b/goldlib/gmb3/gmojamm2.cpp @@ -84,7 +84,7 @@ int JamArea::test_open(const char* file) { if(tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); return fh; } @@ -107,7 +107,7 @@ void JamArea::raw_open() { } } - GFTRK(NULL); + GFTRK(0); } @@ -123,7 +123,7 @@ void JamArea::raw_close() { if(data->fhjhr != -1) { ::close(data->fhjhr); data->fhjhr = -1; } if(data->fhjhw != -1) { ::close(data->fhjhw); data->fhjhw = -1; } - GFTRK(NULL); + GFTRK(0); } @@ -193,7 +193,7 @@ void JamArea::open_area() { data->timesposted = 0; - GFTRK(NULL); + GFTRK(0); } @@ -344,7 +344,7 @@ void JamArea::raw_scan(int __keep_index, int __scanpm) { isopen--; } - GFTRK(NULL); + GFTRK(0); } @@ -356,7 +356,7 @@ void JamArea::scan() { raw_scan(true); - GFTRK(NULL); + GFTRK(0); } @@ -368,7 +368,7 @@ void JamArea::scan_area() { raw_scan(false); - GFTRK(NULL); + GFTRK(0); } @@ -381,7 +381,7 @@ void JamArea::scan_area_pm() { raw_scan(true, true); Msgn->Reset(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmojamm3.cpp b/goldlib/gmb3/gmojamm3.cpp index 787145b..70fb3cf 100644 --- a/goldlib/gmb3/gmojamm3.cpp +++ b/goldlib/gmb3/gmojamm3.cpp @@ -47,7 +47,7 @@ int JamArea::load_message(int __mode, gmsg* __msg, JamHdr& __hdr) { read(data->fhjdx, &_idx, sizeof(JamIndex)); if(_idx.hdroffset == 0xFFFFFFFFL) { - GFTRK(NULL); + GFTRK(0); return false; } @@ -61,7 +61,7 @@ int JamArea::load_message(int __mode, gmsg* __msg, JamHdr& __hdr) { WideLog->printf(": Info: Your msgbase is corrupted."); WideLog->printf("+ Advice: Run a msgbase index rebuild/recover utility."); - GFTRK(NULL); + GFTRK(0); return false; } @@ -368,7 +368,7 @@ int JamArea::load_message(int __mode, gmsg* __msg, JamHdr& __hdr) { throw_free(_kludges2); - GFTRK(NULL); + GFTRK(0); return true; } diff --git a/goldlib/gmb3/gmojamm4.cpp b/goldlib/gmb3/gmojamm4.cpp index e181b43..f0c73ca 100644 --- a/goldlib/gmb3/gmojamm4.cpp +++ b/goldlib/gmb3/gmojamm4.cpp @@ -84,7 +84,7 @@ void JamArea::lock() { else data->highwater = -1; - GFTRK(NULL); + GFTRK(0); } @@ -99,7 +99,7 @@ void JamArea::unlock() { data->islocked = false; } - GFTRK(NULL); + GFTRK(0); } @@ -456,7 +456,7 @@ void JamArea::save_message(int __mode, gmsg* __msg, JamHdr& __hdr) { unlock(); } - GFTRK(NULL); + GFTRK(0); } @@ -501,7 +501,7 @@ void JamArea::new_msgno(gmsg* __msg) { __msg->msgno = data->hdrinfo.basemsgnum + (filelength(data->fhjdx)/sizeof(JamIndex)); - GFTRK(NULL); + GFTRK(0); } @@ -533,7 +533,7 @@ void JamArea::update_timesread(gmsg* msg) { unlock(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmojamm5.cpp b/goldlib/gmb3/gmojamm5.cpp index 0c37c4d..fa5db8c 100644 --- a/goldlib/gmb3/gmojamm5.cpp +++ b/goldlib/gmb3/gmojamm5.cpp @@ -185,7 +185,7 @@ Line* JamArea::make_dump_msg(Line*& lin, gmsg* __msg, char* lng_head) { throw_free(_hdr); throw_free(_base); - GFTRK(NULL); + GFTRK(0); return line; } diff --git a/goldlib/gmb3/gmopcbd1.cpp b/goldlib/gmb3/gmopcbd1.cpp index 1ef437e..ae0883a 100644 --- a/goldlib/gmb3/gmopcbd1.cpp +++ b/goldlib/gmb3/gmopcbd1.cpp @@ -198,7 +198,7 @@ void PcbArea::open() { scan(); } - GFTRK(NULL); + GFTRK(0); } @@ -231,7 +231,7 @@ void PcbArea::save_lastread() { } } - GFTRK(NULL); + GFTRK(0); } @@ -263,7 +263,7 @@ void PcbArea::close() { TestErrorExit(); } - GFTRK(NULL); + GFTRK(0); } @@ -277,7 +277,7 @@ void PcbArea::suspend() { raw_close(); PcbWideClose(); - GFTRK(NULL); + GFTRK(0); } @@ -290,7 +290,7 @@ void PcbArea::resume() { PcbWideOpen(); raw_open(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmopcbd2.cpp b/goldlib/gmb3/gmopcbd2.cpp index ed982ac..fdb12f8 100644 --- a/goldlib/gmb3/gmopcbd2.cpp +++ b/goldlib/gmb3/gmopcbd2.cpp @@ -85,7 +85,7 @@ int PcbWideTestOpen(char* __file) { if(_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); return _fh; } @@ -125,7 +125,7 @@ void PcbWideOpen() { pcbwide->isopen = true; } - GFTRK(NULL); + GFTRK(0); } @@ -141,7 +141,7 @@ void PcbWideClose() { pcbwide->isopen = false; } - GFTRK(NULL); + GFTRK(0); } @@ -154,7 +154,7 @@ void PcbArea::raw_close() { if(data->fhidx != -1) ::close(data->fhidx); data->fhidx = -1; if(data->fhmsg != -1) ::close(data->fhmsg); data->fhmsg = -1; - GFTRK(NULL); + GFTRK(0); } @@ -189,7 +189,7 @@ int PcbArea::test_open(const char* __file) { if(_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); return _fh; } @@ -205,7 +205,7 @@ void PcbArea::raw_open() { data->fhmsg = test_open(real_path()); data->fhidx = test_open(AddPath(real_path(), ".idx")); - GFTRK(NULL); + GFTRK(0); } @@ -357,7 +357,7 @@ void PcbArea::raw_scan(int __keep_index, int __scanpm) { isopen--; } - GFTRK(NULL); + GFTRK(0); } @@ -369,7 +369,7 @@ void PcbArea::scan() { raw_scan(true); - GFTRK(NULL); + GFTRK(0); } @@ -381,7 +381,7 @@ void PcbArea::scan_area() { raw_scan(false); - GFTRK(NULL); + GFTRK(0); } @@ -394,7 +394,7 @@ void PcbArea::scan_area_pm() { raw_scan(true, true); Msgn->Reset(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmopcbd3.cpp b/goldlib/gmb3/gmopcbd3.cpp index 8534826..f6b7450 100644 --- a/goldlib/gmb3/gmopcbd3.cpp +++ b/goldlib/gmb3/gmopcbd3.cpp @@ -226,7 +226,7 @@ int PcbArea::load_message(int __mode, gmsg* __msg, PcbHdr& __hdr) { if(not (__mode & GMSG_TXT)) throw_release(__msg->txt); - GFTRK(NULL); + GFTRK(0); return true; } diff --git a/goldlib/gmb3/gmopcbd4.cpp b/goldlib/gmb3/gmopcbd4.cpp index 3c4f06a..b8899b6 100644 --- a/goldlib/gmb3/gmopcbd4.cpp +++ b/goldlib/gmb3/gmopcbd4.cpp @@ -68,7 +68,7 @@ void PcbArea::lock() { data->islocked = true; } - GFTRK(NULL); + GFTRK(0); } @@ -91,7 +91,7 @@ void PcbArea::unlock() { data->base.active = B2L(data->base.active); data->islocked = false; - GFTRK(NULL); + GFTRK(0); } @@ -386,7 +386,7 @@ void PcbArea::save_message(int __mode, gmsg* __msg, PcbHdr& __hdr) { if(not _was_locked) unlock(); - GFTRK(NULL); + GFTRK(0); } @@ -431,7 +431,7 @@ void PcbArea::new_msgno(gmsg* msg) { msg->msgno = data->base.highmsgno + 1; - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmopcbd5.cpp b/goldlib/gmb3/gmopcbd5.cpp index e3f6a7b..af34e97 100644 --- a/goldlib/gmb3/gmopcbd5.cpp +++ b/goldlib/gmb3/gmopcbd5.cpp @@ -166,7 +166,7 @@ Line* PcbArea::make_dump_msg(Line*& lin, gmsg* __msg, char* lng_head) { throw_free(dumplr); - GFTRK(NULL); + GFTRK(0); return line; } diff --git a/goldlib/gmb3/gmosmb1.cpp b/goldlib/gmb3/gmosmb1.cpp index d237e1e..74baf50 100644 --- a/goldlib/gmb3/gmosmb1.cpp +++ b/goldlib/gmb3/gmosmb1.cpp @@ -144,7 +144,7 @@ void SMBArea::open() { scan(); } - GFTRK(NULL); + GFTRK(0); } @@ -173,7 +173,7 @@ void SMBArea::close() TestErrorExit(); } - GFTRK(NULL); + GFTRK(0); } @@ -254,18 +254,18 @@ int SMBArea::load_hdr(gmsg* __msg, smbmsg_t *smsg) smsgp = smsg ? smsg : &local_smsg; uint32_t reln = Msgn->ToReln(__msg->msgno); if(reln == 0) { - GFTRK(NULL); + GFTRK(0); return false; } fseek(data->sid_fp, (reln - 1L) * sizeof(idxrec_t), SEEK_SET); if(not fread(&smsgp->idx, 1, sizeof(idxrec_t), data->sid_fp) or (smb_lockmsghdr(data, smsgp) != 0)) { - GFTRK(NULL); + GFTRK(0); return false; } int rv = smb_getmsghdr(data, smsgp); smb_unlockmsghdr(data, smsgp); if(rv != 0) { - GFTRK(NULL); + GFTRK(0); return false; } __msg->link.to_set(smsgp->hdr.thread_orig); @@ -337,7 +337,7 @@ int SMBArea::load_hdr(gmsg* __msg, smbmsg_t *smsg) if(not smsg) smb_freemsgmem(smsgp); - GFTRK(NULL); + GFTRK(0); return true; } @@ -360,7 +360,7 @@ int SMBArea::load_msg(gmsg* msg) GFTRK("SMBLoadMsg"); if(not load_hdr(msg, &smsg)) { - GFTRK(NULL); + GFTRK(0); return false; } @@ -491,7 +491,7 @@ add2: smb_freemsgmem(&smsg); - GFTRK(NULL); + GFTRK(0); return true; } @@ -516,18 +516,18 @@ void SMBArea::save_hdr(int mode, gmsg* msg) if(not (mode & GMSG_NEW)) { uint32_t reln = Msgn->ToReln(msg->msgno); if(reln == 0) { - GFTRK(NULL); + GFTRK(0); return; } fseek(data->sid_fp, (reln - 1L) * sizeof(idxrec_t), SEEK_SET); if(not fread(&smsg.idx, 1, sizeof(idxrec_t), data->sid_fp) or (smb_lockmsghdr(data, &smsg) != 0)) { - GFTRK(NULL); + GFTRK(0); return; } int rv = smb_getmsghdr(data, &smsg); smb_unlockmsghdr(data, &smsg); if(rv != 0) { - GFTRK(NULL); + GFTRK(0); return; } smsg.hdr.attr = 0; @@ -581,7 +581,7 @@ void SMBArea::save_hdr(int mode, gmsg* msg) smb_putmsg(data, &smsg); } smb_freemsgmem(&smsg); - GFTRK(NULL); + GFTRK(0); return; } @@ -808,7 +808,7 @@ void SMBArea::save_hdr(int mode, gmsg* msg) throw_xfree(stail-2); smb_freemsgmem(&smsg); - GFTRK(NULL); + GFTRK(0); } @@ -820,7 +820,7 @@ void SMBArea::save_msg(int mode, gmsg* msg) save_hdr(mode | GMSG_HDRTXT, msg); - GFTRK(NULL); + GFTRK(0); } @@ -833,12 +833,12 @@ void SMBArea::del_msg(gmsg* msg) smbmsg_t smsg; uint32_t reln = Msgn->ToReln(msg->msgno); if(reln == 0) { - GFTRK(NULL); + GFTRK(0); return; } fseek(data->sid_fp, (reln - 1L) * sizeof(idxrec_t), SEEK_SET); if(not fread(&smsg.idx, 1, sizeof(idxrec_t), data->sid_fp) or (smb_lockmsghdr(data, &smsg) != 0)) { - GFTRK(NULL); + GFTRK(0); return; } if(smb_getmsghdr(data, &smsg) == 0) { @@ -855,7 +855,7 @@ void SMBArea::del_msg(gmsg* msg) smb_unlockmsghdr(data, &smsg); smb_freemsgmem(&smsg); - GFTRK(NULL); + GFTRK(0); } @@ -957,7 +957,7 @@ Line* SMBArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head) if(not load_hdr(msg, &smsg)) { line = AddLine(line, "Error loading header"); - GFTRK(NULL); + GFTRK(0); return line; } @@ -1094,7 +1094,7 @@ common: smb_freemsgmem(&smsg); - GFTRK(NULL); + GFTRK(0); return line; } diff --git a/goldlib/gmb3/gmosmb2.cpp b/goldlib/gmb3/gmosmb2.cpp index 3a89679..d21ae69 100644 --- a/goldlib/gmb3/gmosmb2.cpp +++ b/goldlib/gmb3/gmosmb2.cpp @@ -119,7 +119,7 @@ void SMBArea::raw_scan(bool keep_index, bool scanpm) } } - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmosqsh1.cpp b/goldlib/gmb3/gmosqsh1.cpp index 6897313..59c59c6 100644 --- a/goldlib/gmb3/gmosqsh1.cpp +++ b/goldlib/gmb3/gmosqsh1.cpp @@ -116,7 +116,7 @@ void SquishArea::raw_close() { if(data->fhsqi != -1) ::close(data->fhsqi); data->fhsqi = -1; if(data->fhsqd != -1) ::close(data->fhsqd); data->fhsqd = -1; - GFTRK(NULL); + GFTRK(0); } @@ -152,7 +152,7 @@ int SquishArea::test_open(const char* __file) { if(_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); return _fh; } @@ -167,7 +167,7 @@ void SquishArea::raw_open() { data->fhsqd = test_open(AddPath(real_path(), ".sqd")); data->fhsqi = test_open(AddPath(real_path(), ".sqi")); - GFTRK(NULL); + GFTRK(0); } @@ -202,7 +202,7 @@ void SquishArea::open() { scan(); } - GFTRK(NULL); + GFTRK(0); } @@ -220,7 +220,7 @@ void SquishArea::save_lastread() { ::close(_fh); } - GFTRK(NULL); + GFTRK(0); } @@ -252,7 +252,7 @@ void SquishArea::close() { TestErrorExit(); } - GFTRK(NULL); + GFTRK(0); } @@ -265,7 +265,7 @@ void SquishArea::suspend() { save_lastread(); raw_close(); - GFTRK(NULL); + GFTRK(0); } @@ -277,7 +277,7 @@ void SquishArea::resume() { raw_open(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmosqsh2.cpp b/goldlib/gmb3/gmosqsh2.cpp index 0622eff..de53361 100644 --- a/goldlib/gmb3/gmosqsh2.cpp +++ b/goldlib/gmb3/gmosqsh2.cpp @@ -67,7 +67,7 @@ void SquishArea::refresh() { read(data->fhsqi, data->idx, (uint)(data->base.totalmsgs*sizeof(SqshIdx))); } - GFTRK(NULL); + GFTRK(0); } @@ -273,7 +273,7 @@ void SquishArea::raw_scan(int __keep_index, int __scanpm) { wide = NULL; } - GFTRK(NULL); + GFTRK(0); } @@ -285,7 +285,7 @@ void SquishArea::scan() { raw_scan(true); - GFTRK(NULL); + GFTRK(0); } @@ -297,7 +297,7 @@ void SquishArea::scan_area() { raw_scan(false); - GFTRK(NULL); + GFTRK(0); } @@ -310,7 +310,7 @@ void SquishArea::scan_area_pm() { raw_scan(true, true); Msgn->Reset(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmosqsh3.cpp b/goldlib/gmb3/gmosqsh3.cpp index 00116be..6e880b4 100644 --- a/goldlib/gmb3/gmosqsh3.cpp +++ b/goldlib/gmb3/gmosqsh3.cpp @@ -45,7 +45,7 @@ int SquishArea::load_message(int __mode, gmsg* __msg, SqshHdr& __hdr) { uint _reln = Msgn->ToReln(__msg->msgno); if(_reln == 0) { - GFTRK(NULL); + GFTRK(0); return false; } @@ -169,7 +169,7 @@ int SquishArea::load_message(int __mode, gmsg* __msg, SqshHdr& __hdr) { else __msg->attr.uns0(); - GFTRK(NULL); + GFTRK(0); return true; } diff --git a/goldlib/gmb3/gmosqsh4.cpp b/goldlib/gmb3/gmosqsh4.cpp index eb9b0f6..30c8364 100644 --- a/goldlib/gmb3/gmosqsh4.cpp +++ b/goldlib/gmb3/gmosqsh4.cpp @@ -62,7 +62,7 @@ void SquishArea::lock() { data->islocked = true; } - GFTRK(NULL); + GFTRK(0); } @@ -81,7 +81,7 @@ void SquishArea::unlock() { chsize(data->fhsqi, data->base.totalmsgs*sizeof(SqshIdx)); data->islocked = false; - GFTRK(NULL); + GFTRK(0); } @@ -206,7 +206,7 @@ void SquishArea::delete_msg(uint __reln) { if(not _was_locked) unlock(); - GFTRK(NULL); + GFTRK(0); } @@ -643,7 +643,7 @@ void SquishArea::save_message(int __mode, gmsg* __msg) { if(not _was_locked) unlock(); - GFTRK(NULL); + GFTRK(0); } @@ -675,7 +675,7 @@ void SquishArea::del_msg(gmsg* __msg) { delete_msg(Msgn->ToReln(__msg->msgno)-1); - GFTRK(NULL); + GFTRK(0); } @@ -710,7 +710,7 @@ void SquishArea::update_timesread(gmsg* msg) { unlock(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmosqsh5.cpp b/goldlib/gmb3/gmosqsh5.cpp index 057297b..0842c7d 100644 --- a/goldlib/gmb3/gmosqsh5.cpp +++ b/goldlib/gmb3/gmosqsh5.cpp @@ -153,7 +153,7 @@ Line* SquishArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head) { HexDump16(buf+7, _ptr, sizeof(SqshHdr)%16, HEX_DUMP2); line = AddLine(line, buf); - GFTRK(NULL); + GFTRK(0); return line; } diff --git a/goldlib/gmb3/gmowcat1.cpp b/goldlib/gmb3/gmowcat1.cpp index 7cc3473..b015fa3 100644 --- a/goldlib/gmb3/gmowcat1.cpp +++ b/goldlib/gmb3/gmowcat1.cpp @@ -63,7 +63,7 @@ void WCatArea::raw_close() { if(data->fhix != -1) ::close(data->fhix); data->fhix = -1; if(data->fhdat != -1) ::close(data->fhdat); data->fhdat = -1; - GFTRK(NULL); + GFTRK(0); } @@ -99,7 +99,7 @@ int WCatArea::test_open(const char* __file) { if(_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); return _fh; } @@ -114,7 +114,7 @@ void WCatArea::raw_open() { data->fhix = test_open(AddPath(real_path(), ".ix")); data->fhdat = test_open(AddPath(real_path(), ".dat")); - GFTRK(NULL); + GFTRK(0); } @@ -168,7 +168,7 @@ void WCatArea::open() { scan(); } - GFTRK(NULL); + GFTRK(0); } @@ -186,7 +186,7 @@ void WCatArea::save_lastread() { ::close(_fh); } - GFTRK(NULL); + GFTRK(0); } @@ -218,7 +218,7 @@ void WCatArea::close() { TestErrorExit(); } - GFTRK(NULL); + GFTRK(0); } @@ -230,7 +230,7 @@ void WCatArea::suspend() { save_lastread(); - GFTRK(NULL); + GFTRK(0); } @@ -242,7 +242,7 @@ void WCatArea::resume() { - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmowcat2.cpp b/goldlib/gmb3/gmowcat2.cpp index 02fe0d3..b6dc2ca 100644 --- a/goldlib/gmb3/gmowcat2.cpp +++ b/goldlib/gmb3/gmowcat2.cpp @@ -62,7 +62,7 @@ void WCatArea::refresh() { read(data->fhix, data->idx, (uint)(ixnum*sizeof(WCatIdx))); } - GFTRK(NULL); + GFTRK(0); } @@ -191,7 +191,7 @@ void WCatArea::raw_scan(int __keep_index, int __scanpm) { wide = NULL; } - GFTRK(NULL); + GFTRK(0); } @@ -203,7 +203,7 @@ void WCatArea::scan() { raw_scan(true); - GFTRK(NULL); + GFTRK(0); } @@ -215,7 +215,7 @@ void WCatArea::scan_area() { raw_scan(false); - GFTRK(NULL); + GFTRK(0); } @@ -228,7 +228,7 @@ void WCatArea::scan_area_pm() { raw_scan(true, true); Msgn->Reset(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmowcat3.cpp b/goldlib/gmb3/gmowcat3.cpp index fee01ca..c1c09bf 100644 --- a/goldlib/gmb3/gmowcat3.cpp +++ b/goldlib/gmb3/gmowcat3.cpp @@ -187,7 +187,7 @@ int WCatArea::load_message(int __mode, gmsg* __msg, WCatHdr& __hdr) { } } - GFTRK(NULL); + GFTRK(0); // Success return true; diff --git a/goldlib/gmb3/gmowcat4.cpp b/goldlib/gmb3/gmowcat4.cpp index 1cc8e34..739b2c5 100644 --- a/goldlib/gmb3/gmowcat4.cpp +++ b/goldlib/gmb3/gmowcat4.cpp @@ -61,7 +61,7 @@ void WCatArea::lock() { data->islocked = true; } - GFTRK(NULL); + GFTRK(0); } @@ -74,7 +74,7 @@ void WCatArea::unlock() { ::unlock(data->fhix, 0, 1); data->islocked = false; - GFTRK(NULL); + GFTRK(0); } @@ -223,7 +223,7 @@ void WCatArea::save_message(int __mode, gmsg* __msg, WCatHdr& __hdr) { if(not _was_locked) unlock(); - GFTRK(NULL); + GFTRK(0); } @@ -268,7 +268,7 @@ void WCatArea::new_msgno(gmsg* __msg) { __msg->msgno = data->base.nextmsgno; - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmowcat5.cpp b/goldlib/gmb3/gmowcat5.cpp index 79f3cc2..8d6c1dd 100644 --- a/goldlib/gmb3/gmowcat5.cpp +++ b/goldlib/gmb3/gmowcat5.cpp @@ -118,7 +118,7 @@ Line* WCatArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head) { HexDump16(buf+7, _ptr, 14, HEX_DUMP2); line = AddLine(line, buf); - GFTRK(NULL); + GFTRK(0); return line; } diff --git a/goldlib/gmb3/gmoxbbs1.cpp b/goldlib/gmb3/gmoxbbs1.cpp index d3cbfd9..d7de812 100644 --- a/goldlib/gmb3/gmoxbbs1.cpp +++ b/goldlib/gmb3/gmoxbbs1.cpp @@ -77,7 +77,7 @@ void XbbsArea::raw_close() { wide->isopen--; } - GFTRK(NULL); + GFTRK(0); } @@ -115,7 +115,7 @@ int XbbsArea::test_open(const char* __file, int sharemode) { if(_tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); return _fh; } @@ -134,7 +134,7 @@ void XbbsArea::raw_open() { if (wide->isopen == 1) wide->user->gufh = ::sopen(AddPath(wide->path, "Users"), O_RDONLY|O_BINARY, WideSharemode, S_STDRW); - GFTRK(NULL); + GFTRK(0); } @@ -217,7 +217,7 @@ void XbbsArea::open() { scan(); } - GFTRK(NULL); + GFTRK(0); } @@ -235,7 +235,7 @@ void XbbsArea::save_lastread() { ::close(_fh); } - GFTRK(NULL); + GFTRK(0); } @@ -267,7 +267,7 @@ void XbbsArea::close() { TestErrorExit(); } - GFTRK(NULL); + GFTRK(0); } @@ -279,7 +279,7 @@ void XbbsArea::suspend() { save_lastread(); - GFTRK(NULL); + GFTRK(0); } @@ -289,7 +289,7 @@ void XbbsArea::resume() { GFTRK("XbbsResume"); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmoxbbs2.cpp b/goldlib/gmb3/gmoxbbs2.cpp index 9994e6c..a6cdd6f 100644 --- a/goldlib/gmb3/gmoxbbs2.cpp +++ b/goldlib/gmb3/gmoxbbs2.cpp @@ -48,7 +48,7 @@ void XbbsArea::refresh() { data->idx_size = (uint)indexnum; - GFTRK(NULL); + GFTRK(0); } @@ -174,7 +174,7 @@ void XbbsArea::raw_scan(int __keep_index, int __scanpm) { wide = NULL; } - GFTRK(NULL); + GFTRK(0); } @@ -186,7 +186,7 @@ void XbbsArea::scan() { raw_scan(true); - GFTRK(NULL); + GFTRK(0); } @@ -198,7 +198,7 @@ void XbbsArea::scan_area() { raw_scan(false); - GFTRK(NULL); + GFTRK(0); } @@ -211,7 +211,7 @@ void XbbsArea::scan_area_pm() { raw_scan(true, true); Msgn->Reset(); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmoxbbs3.cpp b/goldlib/gmb3/gmoxbbs3.cpp index 593b4f8..07ed698 100644 --- a/goldlib/gmb3/gmoxbbs3.cpp +++ b/goldlib/gmb3/gmoxbbs3.cpp @@ -145,7 +145,7 @@ int XbbsArea::load_message(int __mode, gmsg* __msg, XbbsHdr& __hdr) { read(data->fhtext, __msg->txt, _txtlen); } - GFTRK(NULL); + GFTRK(0); // Success return true; diff --git a/goldlib/gmb3/gmoxbbs4.cpp b/goldlib/gmb3/gmoxbbs4.cpp index f8da379..cc76343 100644 --- a/goldlib/gmb3/gmoxbbs4.cpp +++ b/goldlib/gmb3/gmoxbbs4.cpp @@ -83,7 +83,7 @@ void XbbsArea::lock_file(int handle, int32_t position, int32_t length) { if(tries) PopupLocked(0, 0, NULL); - GFTRK(NULL); + GFTRK(0); } @@ -95,7 +95,7 @@ void XbbsArea::unlock_file(int handle, int32_t position, int32_t length) { ::unlock(handle, position, length); - GFTRK(NULL); + GFTRK(0); } @@ -278,7 +278,7 @@ void XbbsArea::save_message(int __mode, gmsg* __msg, XbbsHdr& __hdr) { } } - GFTRK(NULL); + GFTRK(0); } @@ -323,7 +323,7 @@ void XbbsArea::new_msgno(gmsg* __msg) { __msg->msgno = data->idx_size + 1; - GFTRK(NULL); + GFTRK(0); } @@ -412,7 +412,7 @@ void XbbsArea::update_timesread(gmsg* msg) { ::write(data->fhdata, &hdr, sizeof(XbbsHdr)); unlock_file(data->fhdata, position, sizeof(XbbsHdr)); - GFTRK(NULL); + GFTRK(0); } diff --git a/goldlib/gmb3/gmoxbbs5.cpp b/goldlib/gmb3/gmoxbbs5.cpp index c663ac8..08b8baa 100644 --- a/goldlib/gmb3/gmoxbbs5.cpp +++ b/goldlib/gmb3/gmoxbbs5.cpp @@ -121,7 +121,7 @@ Line* XbbsArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head) { HexDump16(buf+7, _ptr, 14, HEX_DUMP2); line = AddLine(line, buf); - GFTRK(NULL); + GFTRK(0); return line; }