Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit399b430

Browse files
committed
refactor: rename filter methods
1 parentcd388dc commit399b430

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎src/utils/file.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4976,7 +4976,7 @@ pioReadFilter_pioRead(VSelf, ft_bytes_t wbuf, err_i *err)
49764976
{
49774977
Self(pioReadFilter);
49784978
fobj_reset_err(err);
4979-
pioTransformResulttr;
4979+
pioFltTransformResulttr;
49804980
size_twlen=wbuf.len;
49814981
ft_bytes_trbuf;
49824982
size_tr;
@@ -4990,7 +4990,7 @@ pioReadFilter_pioRead(VSelf, ft_bytes_t wbuf, err_i *err)
49904990
rbuf=ft_bytes(self->buffer,self->len);
49914991
while (rbuf.len>0)
49924992
{
4993-
tr=$i(pioTransform,self->filter,rbuf,wbuf,err);
4993+
tr=$i(pioFltTransform,self->filter,rbuf,wbuf,err);
49944994
if ($haserr(*err))
49954995
returnwlen-wbuf.len;
49964996
ft_bytes_consume(&rbuf,tr.consumed);
@@ -5022,7 +5022,7 @@ pioReadFilter_pioRead(VSelf, ft_bytes_t wbuf, err_i *err)
50225022

50235023
while (wbuf.len>0&&self->eof)
50245024
{
5025-
r=$i(pioFinish,self->filter,wbuf,err);
5025+
r=$i(pioFltFinish,self->filter,wbuf,err);
50265026
if ($haserr(*err))
50275027
return (ssize_t)(wlen-wbuf.len);
50285028
ft_bytes_consume(&wbuf,r);
@@ -5046,7 +5046,7 @@ pioReadFilter_pioClose(VSelf, bool sync)
50465046

50475047
if (!self->finished)
50485048
{
5049-
r=$i(pioFinish,self->filter,ft_bytes(NULL,0),&err);
5049+
r=$i(pioFltFinish,self->filter,ft_bytes(NULL,0),&err);
50505050
ft_assert(r==0);
50515051
}
50525052
if ($ifdef(errcl=,pioClose,self->wrapped.self,sync))
@@ -5092,7 +5092,7 @@ pioWriteFilter_pioWrite(VSelf, ft_bytes_t rbuf, err_i *err)
50925092
{
50935093
Self(pioWriteFilter);
50945094
fobj_reset_err(err);
5095-
pioTransformResulttr;
5095+
pioFltTransformResulttr;
50965096
size_trlen=rbuf.len;
50975097
ft_bytes_twbuf;
50985098
size_tr;
@@ -5102,7 +5102,7 @@ pioWriteFilter_pioWrite(VSelf, ft_bytes_t rbuf, err_i *err)
51025102
wbuf=ft_bytes(self->buffer,self->capa);
51035103
while (wbuf.len>0)
51045104
{
5105-
tr=$i(pioTransform,self->filter,rbuf,wbuf,err);
5105+
tr=$i(pioFltTransform,self->filter,rbuf,wbuf,err);
51065106
if ($haserr(*err))
51075107
returnrlen-rbuf.len;
51085108
ft_bytes_consume(&rbuf,tr.consumed);
@@ -5146,7 +5146,7 @@ pioWriteFilter_pioFlush(VSelf)
51465146
wbuf=ft_bytes(self->buffer,self->capa);
51475147
while (wbuf.len>0)
51485148
{
5149-
r=$i(pioFinish,self->filter,wbuf,&err);
5149+
r=$i(pioFltFinish,self->filter,wbuf,&err);
51505150
if ($haserr(err))
51515151
returnerr;
51525152
ft_bytes_consume(&wbuf,r);
@@ -5181,7 +5181,7 @@ pioWriteFilter_pioClose(VSelf, bool sync)
51815181

51825182
if (!self->finished)
51835183
{
5184-
r=$i(pioFinish,self->filter,ft_bytes(NULL,0),&err);
5184+
r=$i(pioFltFinish,self->filter,ft_bytes(NULL,0),&err);
51855185
ft_assert(r==0);
51865186
}
51875187
if ($ifdef(errcl=,pioClose,self->wrapped.self,sync))
@@ -5249,11 +5249,11 @@ pioGZDecompressFilter(bool ignoreTruncate)
52495249
returnbind_pioFilter(gz);
52505250
}
52515251

5252-
staticpioTransformResult
5253-
pioGZCompress_pioTransform(VSelf,ft_bytes_trbuf,ft_bytes_twbuf,err_i*err)
5252+
staticpioFltTransformResult
5253+
pioGZCompress_pioFltTransform(VSelf,ft_bytes_trbuf,ft_bytes_twbuf,err_i*err)
52545254
{
52555255
Self(pioGZCompress);
5256-
pioTransformResulttr= {0,0};
5256+
pioFltTransformResulttr= {0,0};
52575257
size_trlen=rbuf.len;
52585258
size_twlen=wbuf.len;
52595259
ssize_trc;
@@ -5285,7 +5285,7 @@ pioGZCompress_pioTransform(VSelf, ft_bytes_t rbuf, ft_bytes_t wbuf, err_i *err)
52855285
}
52865286

52875287
staticsize_t
5288-
pioGZCompress_pioFinish(VSelf,ft_bytes_twbuf,err_i*err)
5288+
pioGZCompress_pioFltFinish(VSelf,ft_bytes_twbuf,err_i*err)
52895289
{
52905290
Self(pioGZCompress);
52915291
size_twlen=wbuf.len;
@@ -5338,11 +5338,11 @@ pioGZCompress_fobjRepr(VSelf)
53385338
return$S("pioGZCompress");
53395339
}
53405340

5341-
staticpioTransformResult
5342-
pioGZDecompress_pioTransform(VSelf,ft_bytes_trbuf,ft_bytes_twbuf,err_i*err)
5341+
staticpioFltTransformResult
5342+
pioGZDecompress_pioFltTransform(VSelf,ft_bytes_trbuf,ft_bytes_twbuf,err_i*err)
53435343
{
53445344
Self(pioGZDecompress);
5345-
pioTransformResulttr= {0,0};
5345+
pioFltTransformResulttr= {0,0};
53465346
size_trlen=rbuf.len;
53475347
size_twlen=wbuf.len;
53485348
intrc;
@@ -5387,7 +5387,7 @@ pioGZDecompress_pioTransform(VSelf, ft_bytes_t rbuf, ft_bytes_t wbuf, err_i* err
53875387
}
53885388

53895389
staticsize_t
5390-
pioGZDecompress_pioFinish(VSelf,ft_bytes_twbuf,err_i*err)
5390+
pioGZDecompress_pioFltFinish(VSelf,ft_bytes_twbuf,err_i*err)
53915391
{
53925392
Self(pioGZDecompress);
53935393
size_twlen=wbuf.len;

‎src/utils/file.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,19 +287,19 @@ fobj_method(pioAsyncWrite);
287287
fobj_method(pioAsyncError);
288288

289289
// Filter
290-
typedefstructpioTransformResult {
290+
typedefstructpioFltTransformResult {
291291
size_tconsumed;
292292
size_tproduced;
293-
}pioTransformResult;
293+
}pioFltTransformResult;
294294

295-
#definemth__pioTransformpioTransformResult, (ft_bytes_t, in), \
295+
#definemth__pioFltTransformpioFltTransformResult, (ft_bytes_t, in), \
296296
(ft_bytes_t, out), \
297297
(err_i*, err)
298-
fobj_method(pioTransform);
299-
#definemth__pioFinishsize_t, (ft_bytes_t, out), (err_i*, err)
300-
fobj_method(pioFinish);
298+
fobj_method(pioFltTransform);
299+
#definemth__pioFltFinishsize_t, (ft_bytes_t, out), (err_i*, err)
300+
fobj_method(pioFltFinish);
301301

302-
#defineiface__pioFiltermth(pioTransform, pioFinish)
302+
#defineiface__pioFiltermth(pioFltTransform, pioFltFinish)
303303
fobj_iface(pioFilter);
304304

305305
externpioWriteFlush_ipioWrapWriteFilter(pioWriteFlush_ifl,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp