Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3538

Timestamp:

08/15/08 21:55:19 (4 months ago)

Author:

dgollub

Message:

The file opensync_mapping_view.c is entirely commented out. It should
be removed.

Several header files have symbols which are unused within the file that
includes them. They have been either removed or moved to the file that
needs them.

The files opensync.h, opensync-support.h and opensync_list.h participate
in an include circular loop. I have removed opensync_list.h from
opensync-support.h and added it as an include to the header files that
actually require it.

Signed-off-by: Erik Hovland <erik@…>

Adapted patch to not remove opensync_mapping_view.c - instead created
task #807. Removed file from build environement.

This patch should fix ticket #802

Signed-off-by: Daniel Gollub <dgollub@…>

Location:

trunk

Files:

: 21 modified

opensync/CMakeLists.txt (modified) (1 diff)
opensync/archive/opensync_archive.h (modified) (1 diff)
opensync/client/opensync_client.c (modified) (1 diff)
opensync/client/opensync_client_proxy.c (modified) (1 diff)
opensync/db/opensync_db.h (modified) (1 diff)
opensync/engine/opensync_mapping_engine.c (modified) (1 diff)
opensync/engine/opensync_mapping_engine_internals.h (modified) (1 diff)
opensync/engine/opensync_mapping_entry_engine.c (modified) (1 diff)
opensync/engine/opensync_mapping_entry_engine_internals.h (modified) (1 diff)
opensync/engine/opensync_sink_engine.c (modified) (1 diff)
opensync/engine/opensync_status.c (modified) (1 diff)
opensync/format/opensync_format_env.h (modified) (1 diff)
opensync/group/opensync_member.h (modified) (1 diff)
opensync/helper/opensync_hashtable.h (modified) (1 diff)
opensync/mapping/opensync_mapping.c (modified) (1 diff)
opensync/mapping/opensync_mapping_table.c (modified) (1 diff)
opensync/opensync-support.h (modified) (1 diff)
opensync/opensync_context.c (modified) (1 diff)
opensync/plugin/opensync_plugin_config.h (modified) (1 diff)
opensync/version/opensync_version.h (modified) (1 diff)
tools/osyncbinary.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/opensync/CMakeLists.txt

r3535	r3538
40	40	mapping/opensync_mapping_entry.c
41	41	mapping/opensync_mapping_table.c
42		~~mapping/opensync_mapping_view.c~~
43	42	merger/opensync_capabilities.c
44	43	merger/opensync_capability.c

trunk/opensync/archive/opensync_archive.h

r2800	r3538
26	26	#define OPENSYNC_ARCHIVE_H_
27	27
	28	#include <opensync/opensync_list.h>
	29
28	30	OSYNC_EXPORT OSyncArchive osync_archive_new(const char filename, OSyncError **error);
29	31	OSYNC_EXPORT OSyncArchive osync_archive_ref(OSyncArchive archive);

trunk/opensync/client/opensync_client.c

r3537	r3538
25	25	#include "opensync-plugin.h"
26	26	#include "opensync-ipc.h"
27		~~#include "opensync-serializer.h"~~
28	27	#include "opensync-format.h"
29	28	#include "opensync-client.h"

trunk/opensync/client/opensync_client_proxy.c

r3537	r3538
24	24	#include "opensync-data.h"
25	25	#include "opensync-ipc.h"
26		~~#include "opensync-serializer.h"~~
27	26	#include "opensync-client.h"
28	27	#include "opensync-group.h"

trunk/opensync/db/opensync_db.h

r3287	r3538
22	22	#define _OPENSYNC_DB_H_
23	23
	24	#include <opensync/opensync_list.h>
24	25
25	26	OSYNC_EXPORT OSyncDB osync_db_new(OSyncError *error);

trunk/opensync/engine/opensync_mapping_engine.c

r3530	r3538
29	29	#include "opensync-data.h"
30	30	#include "opensync-mapping.h"
31		~~#include "opensync-format.h"~~
32		~~#include "opensync-merger.h"~~
33	31	#include "opensync-plugin.h"
34	32

trunk/opensync/engine/opensync_mapping_engine_internals.h

r2788	r3538
23	23	#define OPENSYNC_MAPPING_ENGINE_INTERNALS_H_
24	24
	25	#include "opensync_mapping_entry_engine_internals.h"
	26
25	27	struct OSyncMappingEngine {
26	28	int ref_count;

trunk/opensync/engine/opensync_mapping_entry_engine.c

r2788	r3538
25	25	#include "opensync-group.h"
26	26	#include "opensync-engine.h"
27		~~#include "opensync-client.h"~~
28	27	#include "opensync-data.h"
29	28	#include "opensync-mapping.h"
30		~~#include "opensync-format.h"~~
31		~~#include "opensync-merger.h"~~
32		~~#include "opensync-plugin.h"~~
33	29
34	30	#include "opensync_obj_engine.h"
35		~~#include "opensync_obj_engine_internals.h"~~
36	31
37	32	#include "opensync_mapping_engine.h"

trunk/opensync/engine/opensync_mapping_entry_engine_internals.h

r2788	r3538
22	22	#define OPENSYNC_MAPPING_ENTRY_ENGINE_INTERNALS_H_
23	23
	24	#include "opensync_sink_engine_internals.h"
	25
24	26	typedef struct OSyncMappingEntryEngine {
25	27	int ref_count;

trunk/opensync/engine/opensync_sink_engine.c

r3021	r3538
25	25	#include "opensync-group.h"
26	26	#include "opensync-engine.h"
27		~~#include "opensync-client.h"~~
28	27	#include "opensync-data.h"
29	28	#include "opensync-mapping.h"
30		~~#include "opensync-format.h"~~
31		~~#include "opensync-merger.h"~~
32		~~#include "opensync-plugin.h"~~
33	29
34	30	#include "opensync_obj_engine.h"

trunk/opensync/engine/opensync_status.c

r3044	r3538
29	29
30	30	#include "opensync_engine_internals.h"
31		~~#include "opensync_obj_engine_internals.h"~~
32		~~#include "opensync_sink_engine_internals.h"~~
33		~~#include "opensync_mapping_entry_engine_internals.h"~~
34	31	#include "opensync_mapping_engine_internals.h"
35	32

trunk/opensync/format/opensync_format_env.h

r3318	r3538
21	21	#ifndef _OPENSYNC_FORMAT_ENV_H_
22	22	#define _OPENSYNC_FORMAT_ENV_H_
	23
	24	#include <opensync/opensync_list.h>
23	25
24	26	OSYNC_EXPORT OSyncFormatEnv osync_format_env_new(OSyncError *error);

trunk/opensync/group/opensync_member.h

r3350	r3538
21	21	#ifndef _OPENSYNC_MEMBER_H_
22	22	#define _OPENSYNC_MEMBER_H_
	23
	24	#include <opensync/opensync_list.h>
23	25
24	26	OSYNC_EXPORT OSyncMember osync_member_new(OSyncError *error);

trunk/opensync/helper/opensync_hashtable.h

r3290	r3538
22	22	#ifndef OPENSYNC_HASHTABLE_H_
23	23	#define OPENSYNC_HASHTABLE_H_
	24
	25	#include <opensync/opensync_list.h>
24	26
25	27	typedef void (OSyncHashtableForEach) (const char uid, const char hash, void user_data);

trunk/opensync/mapping/opensync_mapping.c

r2788	r3538
23	23
24	24	#include "opensync-mapping.h"
25		~~#include "opensync-format.h"~~
26		~~#include "opensync-data.h"~~
27	25
28	26	#include "opensync_mapping_internals.h"

trunk/opensync/mapping/opensync_mapping_table.c

r2788	r3538
23	23
24	24	#include "opensync-mapping.h"
25		~~#include "opensync-format.h"~~
26		~~#include "opensync-data.h"~~
27	25	#include "opensync-archive.h"
28	26	#include "opensync-support.h"

trunk/opensync/opensync-support.h

r3224	r3538
21	21	#ifndef _OPENSYNC_SUPPORT_H
22	22	#define _OPENSYNC_SUPPORT_H
23
24		~~#include "opensync_list.h"~~
25	23
26	24	OPENSYNC_BEGIN_DECLS

trunk/opensync/opensync_context.c

r2788	r3538
24	24	#include "opensync-context.h"
25	25	#include "opensync-data.h"
26		~~#include "opensync-format.h"~~
27	26	#include "opensync_context_internals.h"
28	27

trunk/opensync/plugin/opensync_plugin_config.h

r3506	r3538
21	21	#ifndef _OPENSYNC_PLUGIN_CONFIG_H_
22	22	#define _OPENSYNC_PLUGIN_CONFIG_H_
	23
	24	#include <opensync/opensync_list.h>
23	25
24	26	OSYNC_EXPORT OSyncPluginConfig osync_plugin_config_new(OSyncError *error);

trunk/opensync/version/opensync_version.h

r2788	r3538
23	23	#ifndef OPENSYNC_VERSION_H_
24	24	#define OPENSYNC_VERSION_H_
	25
	26	#include <opensync/opensync_list.h>
25	27
26	28	OSYNC_EXPORT OSyncVersion osync_version_new(OSyncError *error);

trunk/tools/osyncbinary.c

r1873	r3538
8	8	//#include <sys/wait.h>
9	9	#include <glib.h>
10		~~#include <sys/time.h>~~
11	10
12	11

Context Navigation

Changeset 3538

Legend:

Download in other formats: