diff options
-rw-r--r-- | colm/ctinput.cc | 4 | ||||
-rw-r--r-- | colm/input.c | 6 | ||||
-rw-r--r-- | colm/input.h | 2 | ||||
-rw-r--r-- | colm/pdarun.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/colm/ctinput.cc b/colm/ctinput.cc index 624f88b0..a4ff653b 100644 --- a/colm/ctinput.cc +++ b/colm/ctinput.cc @@ -108,7 +108,7 @@ int inputStreamPatternGetParseBlock( FsmRun *fsmRun, StreamImpl *ss, return INPUT_DATA; } -int inputStreamPatternGetData( FsmRun *fsmRun, StreamImpl *ss, int skip, char *dest, int length ) +int inputStreamPatternGetData( FsmRun *fsmRun, StreamImpl *ss, char *dest, int length ) { int copied = 0; @@ -322,7 +322,7 @@ int inputStreamConsGetParseBlock( FsmRun *fsmRun, StreamImpl *ss, return INPUT_DATA; } -int inputStreamConsGetData( FsmRun *fsmRun, StreamImpl *ss, int skip, char *dest, int length ) +int inputStreamConsGetData( FsmRun *fsmRun, StreamImpl *ss, char *dest, int length ) { int copied = 0; diff --git a/colm/input.c b/colm/input.c index 3ce576b6..46b72fc6 100644 --- a/colm/input.c +++ b/colm/input.c @@ -208,7 +208,7 @@ int fdGetParseBlock( FsmRun *fsmRun, StreamImpl *ss, return ret; } -int fdGetData( FsmRun *fsmRun, StreamImpl *ss, int skip, char *dest, int length ) +int fdGetData( FsmRun *fsmRun, StreamImpl *ss, char *dest, int length ) { int copied = 0; @@ -562,7 +562,7 @@ static int _getParseBlock( FsmRun *fsmRun, StreamImpl *is, return ret; } -static int _getData( FsmRun *fsmRun, StreamImpl *is, int skip, char *dest, int length ) +static int _getData( FsmRun *fsmRun, StreamImpl *is, char *dest, int length ) { int copied = 0; @@ -576,7 +576,7 @@ static int _getData( FsmRun *fsmRun, StreamImpl *is, int skip, char *dest, int l if ( buf->type == RunBufSourceType ) { Stream *stream = (Stream*)buf->tree; - int glen = stream->in->funcs->getData( fsmRun, stream->in, 0, dest+copied, length ); + int glen = stream->in->funcs->getData( fsmRun, stream->in, dest+copied, length ); if ( glen == 0 ) { debug( REALM_INPUT, "skipping over input\n" ); diff --git a/colm/input.h b/colm/input.h index 41701021..00ce509d 100644 --- a/colm/input.h +++ b/colm/input.h @@ -92,7 +92,7 @@ struct StreamFuncs int skip, char **pdp, int *copied ); int (*getData)( struct _FsmRun *fsmRun, StreamImpl *ss, - int offset, char *dest, int length ); + char *dest, int length ); int (*consumeData)( StreamImpl *ss, int length ); int (*undoConsumeData)( struct _FsmRun *fsmRun, StreamImpl *ss, const char *data, int length ); diff --git a/colm/pdarun.c b/colm/pdarun.c index 39ee60c3..af1967c6 100644 --- a/colm/pdarun.c +++ b/colm/pdarun.c @@ -135,7 +135,7 @@ Head *streamPull( Program *prg, FsmRun *fsmRun, StreamImpl *is, long length ) runBuf->next = fsmRun->consumeBuf; fsmRun->consumeBuf = runBuf; - is->funcs->getData( fsmRun, is, 0, runBuf->data, length ); + is->funcs->getData( fsmRun, is, runBuf->data, length ); is->funcs->consumeData( is, length ); fsmRun->p = fsmRun->pe = 0; @@ -763,7 +763,7 @@ Head *peekMatch( Program *prg, FsmRun *fsmRun, StreamImpl *is ) runBuf->next = fsmRun->consumeBuf; fsmRun->consumeBuf = runBuf; - is->funcs->getData( fsmRun, is, 0, runBuf->data, length ); + is->funcs->getData( fsmRun, is, runBuf->data, length ); fsmRun->p = fsmRun->pe = 0; fsmRun->toklen = 0; @@ -792,7 +792,7 @@ Head *extractMatch( Program *prg, FsmRun *fsmRun, StreamImpl *is ) runBuf->next = fsmRun->consumeBuf; fsmRun->consumeBuf = runBuf; - is->funcs->getData( fsmRun, is, 0, runBuf->data, length ); + is->funcs->getData( fsmRun, is, runBuf->data, length ); is->funcs->consumeData( is, length ); |