Ticket #923: opensync_mapping_engine.c.diff
| File opensync_mapping_engine.c.diff, 705 bytes (added by scriptor, 3 years ago) |
|---|
-
opensync_mapping_engine.c
old new osync_bool osync_mapping_engine_solve(OS 581 581 osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, engine, change); 582 582 583 583 entry = _osync_mapping_engine_find_entry(engine, change); 584 585 if (!entry) { 586 osync_trace(TRACE_ERROR, "%s(): ERROR: _osync_mapping_engine_find_entry() didn't find any entry. engine = %p, change = %p", __func__, engine, change); 587 goto error; 588 } 589 584 590 engine->conflict = FALSE; 585 591 osync_mapping_engine_set_master(engine, entry); 586 592 osync_status_update_mapping(engine->parent->parent, engine, OSYNC_ENGINE_MAPPING_EVENT_SOLVED, NULL);
