jepler/regal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

win32 checkpoint

Browse source
This commit is contained in:
Cass Everitt 2014-01-06 22:13:28 -06:00
parent d5bc2ce3e2
commit 652bdfec5a
5 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/regal/dispatch/RegalDispatchError.py
View file

@ -106,8 +106,9 @@ localInclude = '''
localCode = '''
void InitDispatchError( Dispatch::GL & tbl );
void Err::Init( RegalContext * ctx ) {
void InitDispatchError( Dispatch::GL & tbl );
next = ctx->dispatchGL;
InitDispatchError( ctx->dispatchGL );
}

3
src/regal/RegalDispatchError.cpp
View file

@ -64,8 +64,9 @@ REGAL_NAMESPACE_BEGIN
using namespace ::REGAL_NAMESPACE_INTERNAL::Logging;
using namespace ::REGAL_NAMESPACE_INTERNAL::Token;
void InitDispatchError( Dispatch::GL & tbl );
void Err::Init( RegalContext * ctx ) {
void InitDispatchError( Dispatch::GL & tbl );
next = ctx->dispatchGL;
InitDispatchError( ctx->dispatchGL );
}

26
src/regal/RegalDispatchHttp.h
View file

@ -37,7 +37,7 @@ REGAL_GLOBAL_BEGIN
#include <deque>
#include <string>
#include "pcre.h"
//#include "pcre.h"
#include "RegalDispatch.h"
#include "RegalMutex.h"
@ -62,32 +62,32 @@ struct HttpFboInfo {
struct Breakpoint {
Breakpoint() : enabled(true), count(0), stopAfterCount(0), re(NULL) {}
Breakpoint() : enabled(true), count(0), stopAfterCount(0) {} //, re(NULL) {}
~Breakpoint() {
if( re ) {
pcre_free( re );
}
//if( re ) {
//pcre_free( re );
//}
}
void SetRegularExpression( const std::string & newRe ) {
UNUSED_PARAMETER(newRe);
if( re ) {
pcre_free( re );
}
//if( re ) {
//pcre_free( re );
//}
const char *errStr = NULL;
int offset;
re = pcre_compile( reString.c_str(), 0, &errStr, &offset, NULL );
if( re == NULL ) {
Error( "Could not compile breakpoint regular expression '", reString, "' - ", offset, " - ", errStr );
}
//re = pcre_compile( reString.c_str(), 0, &errStr, &offset, NULL );
//if( re == NULL ) {
// Error( "Could not compile breakpoint regular expression '", reString, "' - ", offset, " - ", errStr );
//}
}
bool enabled;
int count;
int stopAfterCount;
std::string reString;
pcre *re;
//pcre *re;
};
enum HttpRunState {

2
src/regal/RegalHttp.cpp
View file

@ -63,7 +63,7 @@ REGAL_NAMESPACE_END
REGAL_GLOBAL_BEGIN
#include "pcre.h"
//#include "pcre.h"
#include "RegalHttp.h"
#include "RegalDispatchHttp.h"

5
src/regal/RegalInit.cpp
View file

@ -89,12 +89,13 @@ TH2RC th2rc;
Thread::Mutex *sc2rcMutex = NULL;
Thread::Mutex *th2rcMutex = NULL;
void InitDispatchLoader( Dispatch::Global & );
Init::Init()
{
atexit(atExit);
void InitDispatchGlobalLoader( Dispatch::Global & );
InitDispatchGlobalLoader( dispatchGlobal );
InitDispatchLoader( dispatchGlobal );
#if !defined(REGAL_NAMESPACE) && REGAL_SYS_WGL
// Check our phony advapi32.dll, gdi32.dll and user32.dll dependencies