diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 11:56:34 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 11:56:34 +0200 |
| commit | 2082d963975a88c8e4dee3a43b98d939f9a2323f (patch) | |
| tree | 340aa3b7084ed619e994b8bed6edbe77e66c45b2 /runtime | |
| parent | 9b46c03ce20c2d074bafdd68840461ed89b35ef4 (diff) | |
| parent | fcc4d77dd371744530e46a29b7534e89cf8251c4 (diff) | |
| download | rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.gz rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.bz2 rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/cfsysline.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index 18643ba5..c4490b48 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -215,11 +215,11 @@ static rsRetVal doGetSize(uchar **pp, rsRetVal (*pSetHdlr)(void*, uid_t), void * case 'e': i *= (int64) 1024 * 1024 * 1024 * 1024 * 1024 * 1024; ++(*pp); break; /* exa */ /* and now the "new" 1000-based definitions */ case 'K': i *= 1000; ++(*pp); break; - case 'M': i *= 10000; ++(*pp); break; - case 'G': i *= 100000; ++(*pp); break; - case 'T': i *= 1000000; ++(*pp); break; /* tera */ - case 'P': i *= 10000000; ++(*pp); break; /* peta */ - case 'E': i *= 100000000; ++(*pp); break; /* exa */ + case 'M': i *= 1000000; ++(*pp); break; + case 'G': i *= 1000000000; ++(*pp); break; + case 'T': i *= 1000000000000; ++(*pp); break; /* tera */ + case 'P': i *= 1000000000000000; ++(*pp); break; /* peta */ + case 'E': i *= 1000000000000000000; ++(*pp); break; /* exa */ } /* done */ |