diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-25 13:51:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-25 13:51:46 +0200 |
| commit | b829284f37add946ac810b125e3bededa1206c96 (patch) | |
| tree | 823089ac6fcd92ef11957ac89d9ccfc998fd768a /runtime | |
| parent | d45a286f2dee3c3d5aefef1ac16a02578c95f574 (diff) | |
| parent | e39f202c75af187f96a1af07e60892a63e45cd3f (diff) | |
| download | rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.gz rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.xz rsyslog-b829284f37add946ac810b125e3bededa1206c96.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/module-template.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/module-template.h b/runtime/module-template.h index 53f5543a..eb39b587 100644 --- a/runtime/module-template.h +++ b/runtime/module-template.h @@ -348,7 +348,7 @@ static rsRetVal queryEtryPt(uchar *name, rsRetVal (**pEtryPoint)())\ /* modInit() * This has an extra parameter, which is the specific name of the modInit * function. That is needed for built-in modules, which must have unique - * names in order to link statically. Please note that this is alwaysy only + * names in order to link statically. Please note that this is always only * the case with modInit() and NO other entry point. The reason is that only * modInit() is visible form a linker/loader point of view. All other entry * points are passed via rsyslog-internal query functions and are defined @@ -402,7 +402,7 @@ finalize_it:\ /* modExit() * This is the counterpart to modInit(). It destroys a module and makes it ready for * unloading. It is similiar to freeInstance() for the instance data. Please note that - * this entry point needs to free any module-globale data structures and registrations. + * this entry point needs to free any module-global data structures and registrations. * For example, the CfSysLineHandlers a module has registered need to be unregistered * here. This entry point is only called immediately before unloading of the module. So * it is likely to be destroyed. HOWEVER, the caller may decide to keep the module cached. |