diff options
| author | Adrian Thurston <thurston@complang.org> | 2012-12-30 14:55:25 -0500 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2012-12-30 14:55:25 -0500 |
| commit | 05464ac81b04c82681ae31b28554eece87cd70b6 (patch) | |
| tree | 5ae311228006fd553d459e9c59bbe4a795bfa709 | |
| parent | 14bffe74e4041e6c62606f68affefb8e1719fdab (diff) | |
| download | colm-05464ac81b04c82681ae31b28554eece87cd70b6.tar.gz | |
getDataImpl -> getDataSource
| -rw-r--r-- | colm/input.c | 12 | ||||
| -rw-r--r-- | colm/input.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/colm/input.c b/colm/input.c index 16a777db..b1524c27 100644 --- a/colm/input.c +++ b/colm/input.c @@ -157,7 +157,7 @@ int fdGetData( SourceStream *ss, int skip, char *dest, int length, int *copied ) /* Got through the in-mem buffers without copying anything. */ RunBuf *runBuf = newRunBuf(); sourceStreamAppend( ss, runBuf ); - int received = ss->funcs->getDataImpl( ss, runBuf->data, FSM_BUFSIZE ); + int received = ss->funcs->getDataSource( ss, runBuf->data, FSM_BUFSIZE ); if ( received == 0 ) { ret = INPUT_EOD; break; @@ -260,9 +260,9 @@ int fdUndoConsumeData( SourceStream *ss, const char *data, int length ) * File */ -int fileGetDataImpl( SourceStream *ss, char *dest, int length ) +int fileGetDataSource( SourceStream *ss, char *dest, int length ) { - debug( REALM_INPUT, "inputStreamFileGetDataImpl length = %ld\n", length ); + debug( REALM_INPUT, "inputStreamFileGetDataSource length = %ld\n", length ); size_t res = fread( dest, 1, length, ss->file ); return res; } @@ -273,14 +273,14 @@ void initFileFuncs() fileFuncs.getData = &fdGetData; fileFuncs.consumeData = &fdConsumeData; fileFuncs.undoConsumeData = &fdUndoConsumeData; - fileFuncs.getDataImpl = &fileGetDataImpl; + fileFuncs.getDataSource = &fileGetDataSource; } /* * FD */ -int fdGetDataImpl( SourceStream *ss, char *dest, int length ) +int fdGetDataSource( SourceStream *ss, char *dest, int length ) { if ( ss->eof ) return 0; @@ -298,7 +298,7 @@ void initFdFuncs() fdFuncs.getData = &fdGetData; fdFuncs.consumeData = &fdConsumeData; fdFuncs.undoConsumeData = &fdUndoConsumeData; - fdFuncs.getDataImpl = &fdGetDataImpl; + fdFuncs.getDataSource = &fdGetDataSource; } /* diff --git a/colm/input.h b/colm/input.h index 01601cfe..14922c5d 100644 --- a/colm/input.h +++ b/colm/input.h @@ -97,7 +97,7 @@ struct SourceFuncs void (*undoConsumeLangEl)( SourceStream *ss ); /* Private implmentation for some shared get data functions. */ - int (*getDataImpl)( SourceStream *ss, char *dest, int length ); + int (*getDataSource)( SourceStream *ss, char *dest, int length ); }; /* Implements a single source of input data such as a file, string, pattern. |