diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-25 15:21:30 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-25 15:21:30 +0200 |
| commit | 9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb (patch) | |
| tree | f26cc7c18ec628e0bf2e3273d584c23706da09fa /runtime/modules.c | |
| parent | 2c23afa623ce0dd8ddb17b1d11bd2962589b0eb9 (diff) | |
| parent | d397bb25265b8b0926af050c4187cfbc5ab074ca (diff) | |
| download | rsyslog-9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb.tar.gz rsyslog-9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb.tar.bz2 rsyslog-9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb.zip | |
Merge branch 'master' into master-newruleset
Conflicts:
runtime/modules.c
Diffstat (limited to 'runtime/modules.c')
| -rw-r--r-- | runtime/modules.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/modules.c b/runtime/modules.c index f580e58e..8675e414 100644 --- a/runtime/modules.c +++ b/runtime/modules.c @@ -313,8 +313,8 @@ finalize_it: /* get the name of a module */ -uchar -*modGetName(modInfo_t *pThis) +uchar * +modGetName(modInfo_t *pThis) { return((pThis->pszName == NULL) ? (uchar*) "" : pThis->pszName); } |