← Back to branch summary

~ubuntu-branches/ubuntu/wily/irssi/wily

« back to all changes in this revision

Viewing changes to src/core/modules-load.c

  • Committer: Package Import Robot
  • Author(s): Daniel Watkins
  • Date: 2014-10-12 09:44:38 UTC
  • mfrom: (2.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20141012094438-gg8mt9lzwxhb9mqa
Tags: 0.8.17-1ubuntu1
https://launchpad.net/bugs/1423499
* Merge from Debian testing (LP: #1423499).  Remaining changes:
  - Refreshed 03firsttimer_text to follow upstream changes to formatting.
  - Re-enabled 20fix_ssl_proxy_hostname_check.
  - Refreshed 90irc-ubuntu-com to follow upstream changes to config file
    formatting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/modules-load.c
163
163
        GModule *gmodule;
164
164
        MODULE_REC *module;
165
165
        MODULE_FILE_REC *rec;
166
 
        gpointer value1, value2;
 
166
        gpointer value1, value2 = NULL;
167
167
        char *initfunc, *deinitfunc;
168
168
        int found;
169
169
 
184
184
        g_free(initfunc);
185
185
        g_free(deinitfunc);
186
186
 
187
 
        module_init = value1;
188
 
        module_deinit = value2;
189
 
 
190
187
        if (!found) {
191
188
                module_error(MODULE_ERROR_INVALID, NULL,
192
189
                             rootmodule, submodule);
194
191
                return 0;
195
192
        }
196
193
 
 
194
        module_init = value1;
 
195
        module_deinit = value2;
 
196
 
197
197
        /* Call the module's init() function - it should register itself
198
198
           with module_register() function, abort if it doesn't. */
199
199
        module_init();