From 6eaecb68f61e396011e47a968c1a826b5c51c5af Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 13 Jan 2011 14:20:28 -0500 Subject: [PATCH] Removed some old TECH_PREVIEW sections. We no longer use TECH_PREVIEW because of the split master/stable repos. --- webcit/context_loop.c | 32 ++++++++++++-------------------- webcit/messages.c | 6 ------ webcit/static.c | 3 --- webcit/vcard_edit.c | 2 +- 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/webcit/context_loop.c b/webcit/context_loop.c index 35e6ee7b3..bec8e6122 100644 --- a/webcit/context_loop.c +++ b/webcit/context_loop.c @@ -522,16 +522,12 @@ void context_loop(ParsedHttpHdrs *Hdr) /* How long did this transaction take? */ gettimeofday(&tx_finish, NULL); -#ifdef TECH_PREVIEW - if ((Hdr->HR.Handler != NULL) || - ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0)) -#endif - lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n", - ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000, - ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000, - ReqStrs[Hdr->HR.eReqType], - ChrPtr(Hdr->this_page) - ); + lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n", + ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000, + ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000, + ReqStrs[Hdr->HR.eReqType], + ChrPtr(Hdr->this_page) + ); session_detach_modules(Static); session_destroy_modules(&Static); return; @@ -590,16 +586,12 @@ void context_loop(ParsedHttpHdrs *Hdr) gettimeofday(&tx_finish, NULL); -#ifdef TECH_PREVIEW - if ((Hdr->HR.Handler != NULL) && - ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0)) -#endif - lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n", - ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000, - ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000, - ReqStrs[Hdr->HR.eReqType], - ChrPtr(Hdr->this_page) - ); + lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n", + ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000, + ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000, + ReqStrs[Hdr->HR.eReqType], + ChrPtr(Hdr->this_page) + ); session_detach_modules(TheSession); diff --git a/webcit/messages.c b/webcit/messages.c index 812e438f9..951dcc451 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -100,9 +100,6 @@ int load_message(message_summary *Msg, StrBufExtract_token(HdrToken, Buf, 0, '='); StrBufCutLeft(Buf, StrLength(HdrToken) + 1); -#ifdef TECH_PREVIEW - if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf)); -#endif /* look up one of the examine_* functions to parse the content */ if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) && (vHdr != NULL)) { @@ -131,9 +128,6 @@ int load_message(message_summary *Msg, StrBufExtract_token(HdrToken, Buf, 0, ':'); if (StrLength(HdrToken) > 0) { StrBufCutLeft(Buf, StrLength(HdrToken) + 1); -#ifdef TECH_PREVIEW - if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf)); -#endif /* the examine*'s know how to do with mime headers too... */ if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) && (vHdr != NULL)) { diff --git a/webcit/static.c b/webcit/static.c index 145014bc9..f03c7aa9d 100644 --- a/webcit/static.c +++ b/webcit/static.c @@ -79,9 +79,6 @@ void output_static(const char *what) close(fd); -#ifndef TECH_PREVIEW - lprintf(9, "output_static('%s') %s\n", what, content_type); -#endif http_transmit_thing(content_type, 2); } if (yesbstr("force_close_session")) { diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index f5c6ebb20..c2741cea7 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -730,7 +730,7 @@ void display_vcard(StrBuf *Target, ((!isalpha(alpha)) && (!isalpha(this_alpha))) ) { -#ifdef TECH_PREVIEW +#ifdef XXX_XXX new_vcard (Target, v, full, Mime); #else display_parsed_vcard(Target, v, full, Mime); -- 2.30.2