← Back to branch summary

~ubuntu-branches/ubuntu/precise/corosync/precise-proposed

« back to all changes in this revision

Viewing changes to exec/evil.c

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2010-07-02 01:24:53 UTC
  • mfrom: (1.1.4 upstream) (5.1.9 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100702012453-qky79tg6hjly2dmq
Tags: 1.2.1-1ubuntu1
https://launchpad.net/bugs/600900
* Merge from debian unstable (LP: #600900). Remaining changes:
  - Raised consensus time out to 5000ms
  - debian/control, debian/rules: Removing now-unnecessary quilt build-dep

Show diffs side-by-side

added added

removed removed

Lines of Context:
exec/evil.c
117
117
        unsigned int endian_conversion_required);
118
118
 
119
119
static struct sync_callbacks clm_sync_operations = {
 
120
        .api_version            = 1,
120
121
        .name                   = "dummy CLM service",
121
 
        .sync_init              = clm_sync_init,
 
122
        .sync_init_api.sync_init_v1 = clm_sync_init,
122
123
        .sync_process           = clm_sync_process,
123
124
        .sync_activate          = clm_sync_activate,
124
125
        .sync_abort             = clm_sync_abort,
125
126
};
126
127
 
127
128
static struct sync_callbacks evt_sync_operations = {
 
129
        .api_version            = 1,
128
130
        .name                   = "dummy EVT service",
129
 
        .sync_init              = evt_sync_init,
 
131
        .sync_init_api.sync_init_v1 = evt_sync_init,
130
132
        .sync_process           = evt_sync_process,
131
133
        .sync_activate          = evt_sync_activate,
132
134
        .sync_abort             = evt_sync_abort,
212
214
 
213
215
        }
214
216
        if (callbacks_init) {
215
 
                callbacks->sync_init = sync_dummy_init;
 
217
                callbacks->sync_init_api.sync_init_v1 = sync_dummy_init;
216
218
                callbacks->sync_process = sync_dummy_process;
217
219
                callbacks->sync_activate = sync_dummy_activate;
218
220
                callbacks->sync_abort = sync_dummy_abort;