summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Heinrich <theinric@redhat.com>2013-07-18 14:00:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-07-19 14:53:00 +0200
commitcbf7ab6f355f54745920941c7045edd7ee3ff2a0 (patch)
tree8724e773e712428ad7651f5e7614fd121e4b2e9c
parent1cf9955ff9a9fdc739ca1f82d93a81bd2e2aec2c (diff)
downloadrsyslog-cbf7ab6f355f54745920941c7045edd7ee3ff2a0.tar.gz
rsyslog-cbf7ab6f355f54745920941c7045edd7ee3ff2a0.tar.bz2
rsyslog-cbf7ab6f355f54745920941c7045edd7ee3ff2a0.zip
bugfix: correction to the interface of stream obj
The datatype of the argument to SetiMaxFileSize() was too small and could overflow. The SetMaxFileSize() interface wasn't used at all (possibly confused with SetiMaxFileSize()) and was dropped.
-rw-r--r--runtime/stream.c2
-rw-r--r--runtime/stream.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/runtime/stream.c b/runtime/stream.c
index 742799d2..3eb7708d 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -1427,7 +1427,7 @@ finalize_it:
/* property set methods */
/* simple ones first */
DEFpropSetMeth(strm, bDeleteOnClose, int)
-DEFpropSetMeth(strm, iMaxFileSize, int)
+DEFpropSetMeth(strm, iMaxFileSize, int64)
DEFpropSetMeth(strm, iFileNumDigits, int)
DEFpropSetMeth(strm, tOperationsMode, int)
DEFpropSetMeth(strm, tOpenMode, mode_t)
diff --git a/runtime/stream.h b/runtime/stream.h
index 60c68cb2..0f5efef1 100644
--- a/runtime/stream.h
+++ b/runtime/stream.h
@@ -152,7 +152,6 @@ BEGINinterface(strm) /* name must also be changed in ENDinterface macro! */
rsRetVal (*Construct)(strm_t **ppThis);
rsRetVal (*ConstructFinalize)(strm_t *pThis);
rsRetVal (*Destruct)(strm_t **ppThis);
- rsRetVal (*SetMaxFileSize)(strm_t *pThis, int64 iMaxFileSize);
rsRetVal (*SetFileName)(strm_t *pThis, uchar *pszName, size_t iLenName);
rsRetVal (*ReadChar)(strm_t *pThis, uchar *pC);
rsRetVal (*UnreadChar)(strm_t *pThis, uchar c);
@@ -170,7 +169,7 @@ BEGINinterface(strm) /* name must also be changed in ENDinterface macro! */
rsRetVal (*SetWCntr)(strm_t *pThis, number_t *pWCnt);
rsRetVal (*Dup)(strm_t *pThis, strm_t **ppNew);
INTERFACEpropSetMeth(strm, bDeleteOnClose, int);
- INTERFACEpropSetMeth(strm, iMaxFileSize, int);
+ INTERFACEpropSetMeth(strm, iMaxFileSize, int64);
INTERFACEpropSetMeth(strm, iMaxFiles, int);
INTERFACEpropSetMeth(strm, iFileNumDigits, int);
INTERFACEpropSetMeth(strm, tOperationsMode, int);