projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed add_to_iob signature (now returns jb_err)
[privoxy.git]
/
w32log.c
diff --git
a/w32log.c
b/w32log.c
index
0948e4b
..
ada06b2
100644
(file)
--- a/
w32log.c
+++ b/
w32log.c
@@
-1,4
+1,4
@@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.2
2 2002/03/24 12:48:23
jongfoster Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.2
4 2002/03/31 17:19:00
jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
@@
-32,6
+32,12
@@
const char w32log_rcs[] = "$Id: w32log.c,v 1.22 2002/03/24 12:48:23 jongfoster E
*
* Revisions :
* $Log: w32log.c,v $
*
* Revisions :
* $Log: w32log.c,v $
+ * Revision 1.24 2002/03/31 17:19:00 jongfoster
+ * Win32 only: Enabling STRICT to fix a VC++ compile warning.
+ *
+ * Revision 1.23 2002/03/26 22:57:10 jongfoster
+ * Web server name should begin www.
+ *
* Revision 1.22 2002/03/24 12:48:23 jongfoster
* Fixing doc links
*
* Revision 1.22 2002/03/24 12:48:23 jongfoster
* Fixing doc links
*
@@
-150,6
+156,9
@@
const char w32log_rcs[] = "$Id: w32log.c,v 1.22 2002/03/24 12:48:23 jongfoster E
#include <assert.h>
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
+#ifndef STRICT
+#define STRICT
+#endif
#include <windows.h>
#include <richedit.h>
#include <windows.h>
#include <richedit.h>
@@
-247,8
+256,6
@@
const char * g_trustfile = NULL;
/* FIXME: end kludge */
/* FIXME: end kludge */
-
-#ifdef REGEX
/* Regular expression for detected URLs */
#define RE_URL "http:[^ \n\r]*"
/* Regular expression for detected URLs */
#define RE_URL "http:[^ \n\r]*"
@@
-294,8
+301,6
@@
static struct _Pattern
/* this is the terminator statement - do not delete! */
{ NULL, STYLE_NONE }
};
/* this is the terminator statement - do not delete! */
{ NULL, STYLE_NONE }
};
-#endif /* def REGEX */
-
/*
* Public variables
/*
* Public variables
@@
-411,14
+416,11
@@
void TermLogWindow(void)
*********************************************************************/
void LogCreatePatternMatchingBuffers(void)
{
*********************************************************************/
void LogCreatePatternMatchingBuffers(void)
{
-#ifdef REGEX
int i;
for (i = 0; patterns_to_highlight[i].str != NULL; i++)
{
regcomp(&patterns_to_highlight[i].buffer, patterns_to_highlight[i].str, REG_ICASE);
}
int i;
for (i = 0; patterns_to_highlight[i].str != NULL; i++)
{
regcomp(&patterns_to_highlight[i].buffer, patterns_to_highlight[i].str, REG_ICASE);
}
-#endif
-
}
}
@@
-435,14
+437,11
@@
void LogCreatePatternMatchingBuffers(void)
*********************************************************************/
void LogDestroyPatternMatchingBuffers(void)
{
*********************************************************************/
void LogDestroyPatternMatchingBuffers(void)
{
-#ifdef REGEX
int i;
for (i = 0; patterns_to_highlight[i].str != NULL; i++)
{
regfree(&patterns_to_highlight[i].buffer);
}
int i;
for (i = 0; patterns_to_highlight[i].str != NULL; i++)
{
regfree(&patterns_to_highlight[i].buffer);
}
-#endif
-
}
}
@@
-460,7
+459,6
@@
void LogDestroyPatternMatchingBuffers(void)
char *LogGetURLUnderCursor(void)
{
char *szResult = NULL;
char *LogGetURLUnderCursor(void)
{
char *szResult = NULL;
-#ifdef REGEX
regex_t re;
POINT ptCursor;
POINTL ptl;
regex_t re;
POINT ptCursor;
POINTL ptl;
@@
-503,7
+501,6
@@
char *LogGetURLUnderCursor(void)
regfree(&re);
}
regfree(&re);
}
-#endif
return szResult;
}
return szResult;
}
@@
-514,7
+511,7
@@
char *LogGetURLUnderCursor(void)
* Function : LogPutString
*
* Description : Inserts text into the logging window. This is really
* Function : LogPutString
*
* Description : Inserts text into the logging window. This is really
- * a
REGEXP
aware wrapper function to `LogPutStringNoMatch'.
+ * a
regexp
aware wrapper function to `LogPutStringNoMatch'.
*
* Parameters :
* 1 : pszText = pointer to string going to the log window
*
* Parameters :
* 1 : pszText = pointer to string going to the log window
@@
-526,9
+523,7
@@
char *LogGetURLUnderCursor(void)
*********************************************************************/
int LogPutString(const char *pszText)
{
*********************************************************************/
int LogPutString(const char *pszText)
{
-#ifdef REGEX
int i;
int i;
-#endif
int result = 0;
if (pszText == NULL || strlen(pszText) == 0)
int result = 0;
if (pszText == NULL || strlen(pszText) == 0)
@@
-546,7
+541,6
@@
int LogPutString(const char *pszText)
*/
EnterCriticalSection(&g_criticalsection);
*/
EnterCriticalSection(&g_criticalsection);
-#ifdef REGEX
if (g_bHighlightMessages)
{
regmatch_t match;
if (g_bHighlightMessages)
{
regmatch_t match;
@@
-601,13
+595,10
@@
int LogPutString(const char *pszText)
}
}
}
}
}
}
-#endif
result = LogPutStringNoMatch(pszText, STYLE_NONE);
result = LogPutStringNoMatch(pszText, STYLE_NONE);
-#ifdef REGEX
end:
end:
-#endif
LeaveCriticalSection(&g_criticalsection);
return result;
LeaveCriticalSection(&g_criticalsection);
return result;