diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-19 11:20:59 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-19 11:20:59 +0100 |
commit | 6bcc1e371b8c27b227a7c87f475063f7fddfd44f (patch) | |
tree | 0941df531236de6a65b5ddaf02a07020fdc11a97 /plugins/omgssapi | |
parent | be2383f2b80d4fb83abd2765e6467e8d7614ab49 (diff) | |
parent | 5fe837bf7dbdcc245ee233feb1fbcc6d052a4898 (diff) | |
download | rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.tar.gz rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.tar.bz2 rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.zip |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
action.c
Diffstat (limited to 'plugins/omgssapi')
-rw-r--r-- | plugins/omgssapi/omgssapi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c index e4fdf0c0..21c540b7 100644 --- a/plugins/omgssapi/omgssapi.c +++ b/plugins/omgssapi/omgssapi.c @@ -362,9 +362,7 @@ static rsRetVal doTryResume(instanceData *pData) } break; case eDestFORW: - /* rgerhards, 2007-09-11: this can not happen, but I've included it to - * a) make the compiler happy, b) detect any logic errors */ - assert(0); + /* NOOP */ break; } |