Menu
▾
▴
opensync-commits — Mailing list that will receive the commit information
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(56) |
Apr
(109) |
May
(15) |
Jun
(3) |
Jul
(37) |
Aug
(96) |
Sep
(40) |
Oct
(4) |
Nov
(54) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(47) |
Feb
(30) |
Mar
(102) |
Apr
(120) |
May
(68) |
Jun
(54) |
Jul
(53) |
Aug
(122) |
Sep
(190) |
Oct
(71) |
Nov
(85) |
Dec
(108) |
| 2007 |
Jan
(72) |
Feb
(190) |
Mar
(53) |
Apr
(101) |
May
(145) |
Jun
(148) |
Jul
(167) |
Aug
(143) |
Sep
(23) |
Oct
(198) |
Nov
(223) |
Dec
(195) |
| 2008 |
Jan
(100) |
Feb
(129) |
Mar
(79) |
Apr
(77) |
May
(34) |
Jun
(95) |
Jul
(112) |
Aug
(160) |
Sep
(82) |
Oct
(124) |
Nov
(199) |
Dec
(355) |
| 2009 |
Jan
(436) |
Feb
(89) |
Mar
(298) |
Apr
(189) |
May
(33) |
Jun
(88) |
Jul
(105) |
Aug
(44) |
Sep
(181) |
Oct
(87) |
Nov
(75) |
Dec
(1) |
| 2010 |
Jan
(63) |
Feb
(21) |
Mar
(3) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(26) |
Aug
(37) |
Sep
(26) |
Oct
(15) |
Nov
(13) |
Dec
|
|
From: <svn...@op...> - 2010-01-05 18:54:53
|
Author: scriptor Date: Tue Jan 5 19:54:44 2010 New Revision: 5974 URL: http://www.opensync.org/changeset/5974 Log: Typos. Modified: plugins/ldap-sync/src/ldap_format.c plugins/ldap-sync/src/ldap_sasl.c Modified: plugins/ldap-sync/src/ldap_format.c ============================================================================== --- plugins/ldap-sync/src/ldap_format.c Tue Jan 5 19:53:23 2010 (r5973) +++ plugins/ldap-sync/src/ldap_format.c Tue Jan 5 19:54:44 2010 (r5974) @@ -3885,16 +3885,16 @@ * @param objtype The object type in terms of libopensync: "contact", "event", * "todo" or "note". * @param dn The distinguished name of that location in the LDAP DIT, that - * represents, for example,"ou=addressbook" (for contacts) or + * represents, for example, "ou=addressbook" (for contacts) or * "ou=calendar" or the tasks/todos for the notes. Note: Here in the - * format plugin dn will be empty: "". + * format plugin dn will be empty: ''. * @param complex_element_lists Several lists of special XML nodes, * which require special treatment, until a * more general approach has been implemented. * See also ldap_format_add_counter_suffix(). * @param potential_subentries As a result of this function this list contains * the bare subentry mods (= two levels below - * "ou=addressbook", for example)." + * "ou=addressbook", for example). * @param ldapmods As a result of this function this list contains the bare * ldapmods (= one level below "ou=addressbook", for example). * @param error The libopensync error pointer. @@ -5572,10 +5572,10 @@ * @param inpsize The size of the input data * * @param output This will contain the result of the conversion - * @param outpsize The will contain the size of the output + * @param outpsize This will contain the size of the output * * @param free_input - * "You need to set this to TRUE if opensync + * "You need to set this to TRUE if opensync * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator @@ -5696,7 +5696,7 @@ * @param outpsize The will contain the size of the output * * @param free_input - * "You need to set this to TRUE if opensync + * "You need to set this to TRUE if opensync * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator Modified: plugins/ldap-sync/src/ldap_sasl.c ============================================================================== --- plugins/ldap-sync/src/ldap_sasl.c Tue Jan 5 19:53:23 2010 (r5973) +++ plugins/ldap-sync/src/ldap_sasl.c Tue Jan 5 19:54:44 2010 (r5974) @@ -143,12 +143,7 @@ /** * - * @brief Reads in SASL authentication settings and defines some defaults - * - * @returns Certain SASL related default parameters for the authentication. - * Has to be freed by ber_free(); likewise the members of this struct. - * The datatype of this return value is defined in ldap_plugin.h and is - * NOT dependant on libsasl*. + * @brief Reads in SASL authentication settings and defines some defaults. * * @param ld The LDAP connection handle. * @param mech The SASL authentication mechanism. @@ -160,6 +155,10 @@ * someone else. Then the authzid must be the identifier * of this other person. * + * @returns Certain SASL related default parameters for the authentication. + * Has to be freed by ber_free(); likewise the members of this struct. + * The datatype of this return value is defined in ldap_plugin.h and is + * NOT dependant on libsasl*. */ lutilSASLdefaults *ldap_plugin_lutil_sasl_defaults(LDAP *ld, char *mech, char *realm, char *authcid, char *passwd, char *authzid) |
|
From: <svn...@op...> - 2010-01-05 18:53:35
|
Author: scriptor Date: Tue Jan 5 19:53:23 2010 New Revision: 5973 URL: http://www.opensync.org/changeset/5973 Log: A few additional tests regarding the authentification with ns-slapd (= 389-directory-server = fedora-directory-server). The different ldap-sync.conf_* files need to be unified, eventually. In this changeset I have only unified the server address ("$LDAP_SERVER"). A word about SSL/TLS: As long as the openldap libraries are being used, openssl needs to be set up, as it seems. Likewise, as far as the LDAP plugin is linked against the mozldap libraries, the ssl/tls tools from netscape / mozldap need to be used and set up (certutil rather than openssl...). Modified: plugins/ldap-sync/tests/CMakeLists.txt plugins/ldap-sync/tests/ldap-sync.conf plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_slapd plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_slapd plugins/ldap-sync/tests/ldap-sync.conf_external1_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_external1_slapd plugins/ldap-sync/tests/ldap-sync.conf_external2_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_external2_slapd plugins/ldap-sync/tests/ldap-sync.conf_gssapi_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_gssapi_slapd plugins/ldap-sync/tests/ldap-sync.conf_login_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_login_slapd plugins/ldap-sync/tests/ldap-sync.conf_ns-slapd_example plugins/ldap-sync/tests/ldap-sync.conf_ntlm_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_ntlm_slapd plugins/ldap-sync/tests/ldap-sync.conf_plain_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_plain_slapd plugins/ldap-sync/tests/ldap-sync.conf_simple_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_simple_slapd plugins/ldap-sync/tests/ldap-sync.conf_slapd_example plugins/ldap-sync/tests/test.conf Modified: plugins/ldap-sync/tests/CMakeLists.txt ============================================================================== --- plugins/ldap-sync/tests/CMakeLists.txt Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/CMakeLists.txt Tue Jan 5 19:53:23 2010 (r5973) @@ -406,7 +406,7 @@ ADD_TEST( mozldap_auth_digest_md5_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_DIGEST_MD5_SLAPD" ) - # ADD_TEST( mozldap_auth_cram_md5_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_CRAM_MD5_SLAPD" ) + ADD_TEST( mozldap_auth_cram_md5_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_CRAM_MD5_SLAPD" ) ADD_TEST( mozldap_auth_ntlm_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_NTLM_SLAPD" ) @@ -431,6 +431,10 @@ ADD_TEST( mozldap_auth_gssapi_nsslapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_GSSAPI_NSSLAPD" ) + ADD_TEST( mozldap_auth_external1_nsslapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_EXTERNAL1_NSSLAPD" ) + + ADD_TEST( mozldap_auth_external2_nsslapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_EXTERNAL2_NSSLAPD" ) + ENDIF (RUN_AUTH_TESTS) @@ -582,9 +586,9 @@ ADD_TEST( plugin_auth_gssapi_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_gssapi_nsslapd" ) - # ADD_TEST( plugin_auth_external1_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_external1_nsslapd" ) + ADD_TEST( plugin_auth_external1_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_external1_nsslapd" ) - # ADD_TEST( plugin_auth_external2_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_external2_nsslapd" ) + ADD_TEST( plugin_auth_external2_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_external2_nsslapd" ) ENDIF (RUN_AUTH_TESTS) Modified: plugins/ldap-sync/tests/ldap-sync.conf ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>389</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>3890</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>389</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>3890</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>389</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_external1_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_external1_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_external1_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -160,7 +160,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>jl2.example.com</Address> + <Address>192.168.1.2</Address> <Port>6360</Port> <Protocol>ldaps</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_external1_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_external1_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_external1_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -160,7 +160,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>636</Port> <Protocol>ldaps</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_external2_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_external2_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_external2_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -160,7 +160,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>jl2.example.com</Address> + <Address>192.168.1.2</Address> <Port>3890</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_external2_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_external2_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_external2_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -160,7 +160,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>389</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_gssapi_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_gssapi_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_gssapi_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -160,7 +160,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>3890</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_gssapi_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_gssapi_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_gssapi_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -160,7 +160,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>389</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_login_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_login_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_login_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>6360</Port> <Protocol>ldaps</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_login_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_login_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_login_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>636</Port> <Protocol>ldaps</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_ns-slapd_example ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_ns-slapd_example Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_ns-slapd_example Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>3890</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_ntlm_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_ntlm_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_ntlm_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>3890</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_ntlm_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_ntlm_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_ntlm_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -159,7 +159,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>389</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_plain_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_plain_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_plain_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>6360</Port> <Protocol>ldaps</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_plain_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_plain_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_plain_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>636</Port> <Protocol>ldaps</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_simple_nsslapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_simple_nsslapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_simple_nsslapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>3890</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_simple_slapd ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_simple_slapd Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_simple_slapd Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>389</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/ldap-sync.conf_slapd_example ============================================================================== --- plugins/ldap-sync/tests/ldap-sync.conf_slapd_example Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/ldap-sync.conf_slapd_example Tue Jan 5 19:53:23 2010 (r5973) @@ -145,7 +145,7 @@ <Connection> <ActiveConnection>Network</ActiveConnection> <Network> - <Address>localhost</Address> + <Address>192.168.1.2</Address> <Port>389</Port> <Protocol>ldap</Protocol> </Network> Modified: plugins/ldap-sync/tests/test.conf ============================================================================== --- plugins/ldap-sync/tests/test.conf Tue Jan 5 14:31:28 2010 (r5972) +++ plugins/ldap-sync/tests/test.conf Tue Jan 5 19:53:23 2010 (r5973) @@ -5,58 +5,62 @@ # CFG="/home/user1/.opensync/group2/2/ldap-sync.conf" # +export LDAP_SERVER="192.168.1.2" ############ # How do you intend to authenticate against the LDAP server: # The AUTH variable is used for the command lines tools ldapsearch, # ldapadd etc. only. It is NOT used for the ldap-sync plugin of libopensync. ### Examples for slapd from openldap for the ldap utilities from openldap: ### #AUTH="-Y DIGEST-MD5 -U ldap_user -w secret -Q" -AUTH="-Y GSSAPI -Q" +AUTH="-h ${LDAP_SERVER} -Y GSSAPI -Q" ### Example for ns-slapd from the fedora directory server for the ldap ### utilities from openldap: ### -#AUTH="-x -D cn=ldap_user,ou=People,dc=example,dc=com -w secret -h localhost -p 3890" +#AUTH="-x -D cn=ldap_user,ou=People,dc=example,dc=com -w secret -h ${LDAP_SERVER} -p 3890" ######################### # Only, if you write: cmake ... -DRUN_AUTH_TESTS=on .. -AUTH_OPENLDAP_SIMPLE_SLAPD='-x -D "cn=ldap_user,ou=people,dc=example,dc=com" -w secret -h localhost -p 389' -AUTH_OPENLDAP_DIGEST_MD5_SLAPD='-Y DIGEST-MD5 -U "ldap_user" -w secret -h localhost -p 389' -AUTH_OPENLDAP_CRAM_MD5_SLAPD='-Y CRAM-MD5 -U "ldap_user" -w secret -h localhost -p 389' -AUTH_OPENLDAP_NTLM_SLAPD='-Y NTLM -U "ldap_user" -w secret -h localhost -p 389' -AUTH_OPENLDAP_LOGIN_SLAPD='-ZZ -Y LOGIN -U "ldap_user" -w secret -h localhost -p 389' -AUTH_OPENLDAP_PLAIN_SLAPD='-ZZ -Y PLAIN -U "ldap_user" -w secret -h localhost -p 389' -AUTH_OPENLDAP_GSSAPI_SLAPD='-Y GSSAPI -h localhost -p 389' +AUTH_OPENLDAP_SIMPLE_SLAPD='-x -D "cn=ldap_user,ou=people,dc=example,dc=com" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_OPENLDAP_DIGEST_MD5_SLAPD='-Y DIGEST-MD5 -U "ldap_user" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_OPENLDAP_CRAM_MD5_SLAPD='-Y CRAM-MD5 -U "ldap_user" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_OPENLDAP_NTLM_SLAPD='-Y NTLM -U "ldap_user" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_OPENLDAP_LOGIN_SLAPD='-ZZ -Y LOGIN -U "ldap_user" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_OPENLDAP_PLAIN_SLAPD='-ZZ -Y PLAIN -U "ldap_user" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_OPENLDAP_GSSAPI_SLAPD='-Y GSSAPI -h ${LDAP_SERVER} -p 389' # This is LDAP over SSL/TLS: -AUTH_OPENLDAP_EXTERNAL1_SLAPD='-Y EXTERNAL -H "ldaps://localhost:636"' +AUTH_OPENLDAP_EXTERNAL1_SLAPD='-Y EXTERNAL -H "ldaps://${LDAP_SERVER}:636"' # This is TLS from inside LDAP, also known by the term "STARTTLS": -AUTH_OPENLDAP_EXTERNAL2_SLAPD='-Y EXTERNAL -ZZ -h jl2.example.com -p 389' +AUTH_OPENLDAP_EXTERNAL2_SLAPD='-Y EXTERNAL -ZZ -h ${LDAP_SERVER} -p 389' -AUTH_OPENLDAP_SIMPLE_NSSLAPD='-x -D "cn=ldap_user,ou=People,dc=example,dc=com" -w secret -h localhost -p 3890' -AUTH_OPENLDAP_DIGEST_MD5_NSSLAPD='-Y DIGEST-MD5 -h localhost -p 3890 -U "ldap_user" -w "secret"' -AUTH_OPENLDAP_CRAM_MD5_NSSLAPD='-Y CRAM-MD5 -h localhost -p 3890 -U "ldap_user" -w "secret"' -AUTH_OPENLDAP_NTLM_NSSLAPD='-Y NTLM -h localhost -p 3890 -U "ldap_user" -w "secret"' -AUTH_OPENLDAP_GSSAPI_NSSLAPD='-Y GSSAPI -h localhost -p 3890' +AUTH_OPENLDAP_SIMPLE_NSSLAPD='-x -D "cn=ldap_user,ou=People,dc=example,dc=com" -w secret -h ${LDAP_SERVER} -p 3890' +AUTH_OPENLDAP_DIGEST_MD5_NSSLAPD='-Y DIGEST-MD5 -h ${LDAP_SERVER} -p 3890 -U "ldap_user" -w "secret"' +AUTH_OPENLDAP_CRAM_MD5_NSSLAPD='-Y CRAM-MD5 -h ${LDAP_SERVER} -p 3890 -U "ldap_user" -w "secret"' +AUTH_OPENLDAP_NTLM_NSSLAPD='-Y NTLM -h ${LDAP_SERVER} -p 3890 -U "ldap_user" -w "secret"' +AUTH_OPENLDAP_GSSAPI_NSSLAPD='-Y GSSAPI -h ${LDAP_SERVER} -p 3890' -AUTH_MOZLDAP_SIMPLE_SLAPD='-D "cn=ldap_user,ou=people,dc=example,dc=com" -w secret -h localhost -p 389' -AUTH_MOZLDAP_DIGEST_MD5_SLAPD='-o "mech=DIGEST-MD5" -o "authid=ldap_user" -w secret -h localhost -p 389' -AUTH_MOZLDAP_CRAM_MD5_SLAPD='-o "mech=CRAM-MD5" -o "authid=ldap_user" -w secret -h localhost -p 389' -AUTH_MOZLDAP_NTLM_SLAPD='-o "mech=NTLM" -o "authid=ldap_user" -w secret -h localhost -p 389' -AUTH_MOZLDAP_LOGIN_SLAPD='-ZZZ -o "mech=LOGIN" -h localhost -p 389 -P /etc/dirsrv/slapd-jl2 -N "Client-Cert" -K /etc/dirsrv/slapd-jl2 -W "" -o "authid=ldap_user" -w "secret"' -AUTH_MOZLDAP_PLAIN_SLAPD='-ZZZ -o "mech=PLAIN" -h localhost -p 389 -P /etc/dirsrv/slapd-jl2 -N "Client-Cert" -K /etc/dirsrv/slapd-jl2 -W "" -o "authid=ldap_user" -w "secret"' -AUTH_MOZLDAP_GSSAPI_SLAPD='-h jl2.example.com -p 389 -o "mech=GSSAPI" -o "realm=example.com" -s base -b "ou=addressbook,dc=example,dc=com"' +AUTH_MOZLDAP_SIMPLE_SLAPD='-D "cn=ldap_user,ou=people,dc=example,dc=com" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_MOZLDAP_DIGEST_MD5_SLAPD='-o "mech=DIGEST-MD5" -o "authid=ldap_user" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_MOZLDAP_CRAM_MD5_SLAPD='-o "mech=CRAM-MD5" -o "authid=ldap_user" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_MOZLDAP_NTLM_SLAPD='-o "mech=NTLM" -o "authid=ldap_user" -w secret -h ${LDAP_SERVER} -p 389' +AUTH_MOZLDAP_LOGIN_SLAPD='-ZZZ -o "mech=LOGIN" -h ${LDAP_SERVER} -p 389 -P /etc/dirsrv/slapd-jl2 -N "Client-Cert" -K /etc/dirsrv/slapd-jl2 -W "" -o "authid=ldap_user" -w "secret"' +AUTH_MOZLDAP_PLAIN_SLAPD='-ZZZ -o "mech=PLAIN" -h ${LDAP_SERVER} -p 389 -P /etc/dirsrv/slapd-jl2 -N "Client-Cert" -K /etc/dirsrv/slapd-jl2 -W "" -o "authid=ldap_user" -w "secret"' +AUTH_MOZLDAP_GSSAPI_SLAPD='-h ${LDAP_SERVER} -p 389 -o "mech=GSSAPI" -o "realm=example.com" -s base -b "ou=addressbook,dc=example,dc=com"' -AUTH_MOZLDAP_SIMPLE_NSSLAPD='-D "cn=ldap_user,ou=People,dc=example,dc=com" -w secret -h localhost -p 3890' -AUTH_MOZLDAP_DIGEST_MD5_NSSLAPD='-h localhost -p 3890 -o "mech=DIGEST-MD5" -o "authid=ldap_user" -w secret' -AUTH_MOZLDAP_CRAM_MD5_NSSLAPD='-h localhost -p 3890 -o "mech=CRAM-MD5" -o "authid=ldap_user" -w secret' -AUTH_MOZLDAP_NTLM_NSSLAPD='-h localhost -p 3890 -o "mech=NTLM" -o "authid=ldap_user" -w secret' -AUTH_MOZLDAP_LOGIN_NSSLAPD='-Z -h localhost -p 6360 -o "mech=LOGIN" -o "authid=ldap_user" -w secret' -AUTH_MOZLDAP_PLAIN_NSSLAPD='-Z -h localhost -p 6360 -o "mech=PLAIN" -o "authid=ldap_user" -w secret' -AUTH_MOZLDAP_GSSAPI_NSSLAPD='-h jl2.example.com -p 3890 -o "mech=GSSAPI" -o "realm=example.com" -s base -b "ou=addressbook,dc=example,dc=com"' - +AUTH_MOZLDAP_SIMPLE_NSSLAPD='-D "cn=ldap_user,ou=People,dc=example,dc=com" -w secret -h ${LDAP_SERVER} -p 3890' +AUTH_MOZLDAP_DIGEST_MD5_NSSLAPD='-h ${LDAP_SERVER} -p 3890 -o "mech=DIGEST-MD5" -o "authid=ldap_user" -w secret' +AUTH_MOZLDAP_CRAM_MD5_NSSLAPD='-h ${LDAP_SERVER} -p 3890 -o "mech=CRAM-MD5" -o "authid=ldap_user" -w secret' +AUTH_MOZLDAP_NTLM_NSSLAPD='-h ${LDAP_SERVER} -p 3890 -o "mech=NTLM" -o "authid=ldap_user" -w secret' +AUTH_MOZLDAP_LOGIN_NSSLAPD='-Z -h ${LDAP_SERVER} -p 6360 -o "mech=LOGIN" -o "authid=ldap_user" -w secret' +AUTH_MOZLDAP_PLAIN_NSSLAPD='-Z -h ${LDAP_SERVER} -p 6360 -o "mech=PLAIN" -o "authid=ldap_user" -w secret' +AUTH_MOZLDAP_GSSAPI_NSSLAPD='-h ${LDAP_SERVER} -p 3890 -o "mech=GSSAPI" -o "realm=example.com" -s base -b "ou=addressbook,dc=example,dc=com"' +# This is LDAP over SSL/TLS: +AUTH_MOZLDAP_EXTERNAL1_NSSLAPD='-Z -h ${LDAP_SERVER} -p 6360 -P ~/.netscape -N "ldap_user" -W "secret" -1 -b "dc=example,dc=com" -s base ""' +# This is TLS from inside LDAP ("STARTTLS"): +AUTH_MOZLDAP_EXTERNAL2_NSSLAPD='-ZZZ -h ${LDAP_SERVER} -p 3890 -P ~/.netscape -N "ldap_user" -W "secret" -1 -b "dc=example,dc=com" -s base ""' BASE_CONTACT="ou=addressbook,dc=example,dc=com" |
|
From: <svn...@op...> - 2010-01-05 13:49:52
|
Author: dgollub Date: Tue Jan 5 14:31:28 2010 New Revision: 5972 URL: http://www.opensync.org/changeset/5972 Log: Export osync_queue_cross_link to make this available to osplugin process for external plugins. This fixes evo2-sync plugin and other OSYNC_START_TYPE_PROCESS plugins. fixes #1190 Modified: trunk/opensync.sym trunk/opensync/client/osplugin.c trunk/opensync/ipc/opensync_queue.h trunk/opensync/ipc/opensync_queue_internals.h Modified: trunk/opensync.sym ============================================================================== --- trunk/opensync.sym Tue Jan 5 14:29:49 2010 (r5971) +++ trunk/opensync.sym Tue Jan 5 14:31:28 2010 (r5972) @@ -655,6 +655,7 @@ osync_plugin_unref osync_queue_connect osync_queue_create +osync_queue_cross_link osync_queue_disconnect osync_queue_new osync_queue_new_from_fd Modified: trunk/opensync/client/osplugin.c ============================================================================== --- trunk/opensync/client/osplugin.c Tue Jan 5 14:29:49 2010 (r5971) +++ trunk/opensync/client/osplugin.c Tue Jan 5 14:31:28 2010 (r5972) @@ -22,7 +22,9 @@ #include "opensync_internals.h" #include "opensync-ipc.h" + #include "opensync-client.h" +#include "opensync_client_internals.h" static void usage (int ecode) { @@ -99,10 +101,12 @@ if (!osync_client_set_incoming_queue(client, incoming, &error)) goto error; - osync_queue_unref(incoming); if (!osync_client_set_outgoing_queue(client, outgoing, &error)) goto error; + osync_queue_cross_link(incoming, outgoing); + + osync_queue_unref(incoming); osync_queue_unref(outgoing); } else { /* Create connection pipes **/ Modified: trunk/opensync/ipc/opensync_queue.h ============================================================================== --- trunk/opensync/ipc/opensync_queue.h Tue Jan 5 14:29:49 2010 (r5971) +++ trunk/opensync/ipc/opensync_queue.h Tue Jan 5 14:31:28 2010 (r5972) @@ -120,6 +120,20 @@ */ OSYNC_EXPORT osync_bool osync_queue_disconnect(OSyncQueue *queue, OSyncError **error); +/** + * @brief Cross links command queue and reply queue + * + * Stores the queue used for replies in the command queue object so + * that timeout responses can be sent if necessary. + * And stores the command queue in the reply queue object so that + * replies can remove pending messages before they time out. + * + * @param cmd_queue The command queue used to receive incoming commands + * @param reply_queue The queue used to send replies + * + */ +OSYNC_EXPORT void osync_queue_cross_link(OSyncQueue *cmd_queue, OSyncQueue *reply_queue); + /*@}*/ #endif /* _OPENSYNC_QUEUE_H */ Modified: trunk/opensync/ipc/opensync_queue_internals.h ============================================================================== --- trunk/opensync/ipc/opensync_queue_internals.h Tue Jan 5 14:29:49 2010 (r5971) +++ trunk/opensync/ipc/opensync_queue_internals.h Tue Jan 5 14:31:28 2010 (r5972) @@ -90,20 +90,6 @@ OSYNC_TEST_EXPORT void osync_queue_set_message_handler(OSyncQueue *queue, OSyncMessageHandler handler, gpointer user_data); /** - * @brief Cross links command queue and reply queue - * - * Stores the queue used for replies in the command queue object so - * that timeout responses can be sent if necessary. - * And stores the command queue in the reply queue object so that - * replies can remove pending messages before they time out. - * - * @param cmd_queue The command queue used to receive incoming commands - * @param reply_queue The queue used to send replies - * - */ -OSYNC_TEST_EXPORT void osync_queue_cross_link(OSyncQueue *cmd_queue, OSyncQueue *reply_queue); - -/** * @brief Remove cross links between command queues and reply queues * * Removes the cross-links from this queue and all queues linked |
|
From: <svn...@op...> - 2010-01-05 13:29:59
|
Author: dgollub Date: Tue Jan 5 14:29:49 2010 New Revision: 5971 URL: http://www.opensync.org/changeset/5971 Log: Added osync_capability_add_parameter function to the symbols fail to let the symbols API test pass. Got broken due to previous commit. Modified: trunk/opensync.sym Modified: trunk/opensync.sym ============================================================================== --- trunk/opensync.sym Mon Jan 4 22:10:37 2010 (r5970) +++ trunk/opensync.sym Tue Jan 5 14:29:49 2010 (r5971) @@ -8,6 +8,7 @@ osync_capabilities_ref osync_capabilities_unref osync_capability_add_child +osync_capability_add_parameter osync_capability_get_childs osync_capability_get_displayname osync_capability_get_max |
|
From: <svn...@op...> - 2010-01-04 21:10:46
|
Author: dgollub Date: Mon Jan 4 22:10:37 2010 New Revision: 5970 URL: http://www.opensync.org/changeset/5970 Log: Introduced osync_capability_add_parameter interface to handle a list of parameters. fixes #1182 Modified: trunk/opensync/capabilities/opensync_capability.c trunk/opensync/capabilities/opensync_capability.h trunk/opensync/capabilities/opensync_capability_private.h Modified: trunk/opensync/capabilities/opensync_capability.c ============================================================================== --- trunk/opensync/capabilities/opensync_capability.c Mon Jan 4 21:58:59 2010 (r5969) +++ trunk/opensync/capabilities/opensync_capability.c Mon Jan 4 22:10:37 2010 (r5970) @@ -361,18 +361,21 @@ { osync_assert(capability); - return capability->parameter; + return osync_list_nth_data(capability->parameters, 0); } -void osync_capability_set_parameter(OSyncCapability *capability, OSyncCapabilityParameter *parameter) +void osync_capability_add_parameter(OSyncCapability *capability, OSyncCapabilityParameter *parameter) { osync_assert(capability); osync_assert(parameter); - if (capability->parameter) - osync_capability_parameter_unref(capability->parameter); + capability->parameters = osync_list_append(capability->parameters, parameter); + osync_capability_parameter_ref(parameter); +} - capability->parameter = osync_capability_parameter_ref(parameter); +void osync_capability_set_parameter(OSyncCapability *capability, OSyncCapabilityParameter *parameter) +{ + osync_capability_add_parameter(capability, parameter); } OSyncCapabilityType osync_capability_get_type(OSyncCapability *capability) Modified: trunk/opensync/capabilities/opensync_capability.h ============================================================================== --- trunk/opensync/capabilities/opensync_capability.h Mon Jan 4 21:58:59 2010 (r5969) +++ trunk/opensync/capabilities/opensync_capability.h Mon Jan 4 22:10:37 2010 (r5970) @@ -146,14 +146,21 @@ * @param capability The pointer to a capability object * @return Pointer to the capability parameter of this capability object */ -OSYNC_EXPORT OSyncCapabilityParameter *osync_capability_get_parameter(OSyncCapability *capability); +OSYNC_EXPORT OSyncCapabilityParameter *osync_capability_get_parameter(OSyncCapability *capability) OSYNC_DEPRECATED; /** * @brief Set the capability parameter of the capability object * @param capability The pointer to a capability object * @param parameter the parameter to set for the capability object */ -OSYNC_EXPORT void osync_capability_set_parameter(OSyncCapability *capability, OSyncCapabilityParameter *parameter); +OSYNC_EXPORT void osync_capability_set_parameter(OSyncCapability *capability, OSyncCapabilityParameter *parameter) OSYNC_DEPRECATED; + +/** + * @brief Add a capability parameter to the capability object + * @param capability The pointer to a capability object + * @param parameter the parameter to add to the capability object + */ +OSYNC_EXPORT void osync_capability_add_parameter(OSyncCapability *capability, OSyncCapabilityParameter *parameter); /** * @brief Get capability type of this capability object Modified: trunk/opensync/capabilities/opensync_capability_private.h ============================================================================== --- trunk/opensync/capabilities/opensync_capability_private.h Mon Jan 4 21:58:59 2010 (r5969) +++ trunk/opensync/capabilities/opensync_capability_private.h Mon Jan 4 22:10:37 2010 (r5970) @@ -48,7 +48,7 @@ /** Name */ char *name; /** Parameter */ - OSyncCapabilityParameter *parameter; + OSyncList *parameters; /* OSyncCapabilityParameter * list */ /** Type */ OSyncCapabilityType type; /** ValEnum */ |
|
From: <svn...@op...> - 2010-01-04 20:59:07
|
Author: dgollub Date: Mon Jan 4 21:58:59 2010 New Revision: 5969 URL: http://www.opensync.org/changeset/5969 Log: Fix gcc 4.4.1 compiler warning of uninitialized variable. Modified: trunk/opensync/engine/opensync_mapping_engine.c Modified: trunk/opensync/engine/opensync_mapping_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.c Mon Jan 4 21:58:11 2010 (r5968) +++ trunk/opensync/engine/opensync_mapping_engine.c Mon Jan 4 21:58:59 2010 (r5969) @@ -736,7 +736,7 @@ OSyncList *e = NULL; OSyncChange *change = NULL; OSyncMappingEntryEngine *entry = NULL; - OSyncConvCmpResult cmpret; + OSyncConvCmpResult cmpret = OSYNC_CONV_DATA_UNKNOWN; mapping = m->data; /* Get the first change of the mapping to test. Compare the given change with this change. |
|
From: <svn...@op...> - 2010-01-04 20:58:19
|
Author: dgollub Date: Mon Jan 4 21:58:11 2010 New Revision: 5968 URL: http://www.opensync.org/changeset/5968 Log: Introduce OSYNC_DEPRECATED to declare function as deprecated. Macros got copied from libsyncml. Modified: trunk/opensync/opensync.h Modified: trunk/opensync/opensync.h ============================================================================== --- trunk/opensync/opensync.h Mon Jan 4 21:30:47 2010 (r5967) +++ trunk/opensync/opensync.h Mon Jan 4 21:58:11 2010 (r5968) @@ -67,6 +67,22 @@ #define OSYNC_TEST_EXPORT #endif +/* Mark function as depercated for a more stable API + * (Copied from libsyncml) + */ +#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2) + /* gcc >= 3.2 */ +# define OSYNC_DEPRECATED __attribute__ ((deprecated)) +#elif defined(_MSC_VER) && (_MSC_VER >= 1300) && (_MSC_VER < 1400) + /* msvc >= 7 */ +# define OSYNC_DEPRECATED __declspec(deprecated) +#elif defined(_MSV_VER) && (_MSC_VER >= 1400) + /* MS Visual Studio 2005 */ +# define OSYNC_DEPRECATED +#else +# define OSYNC_DEPRECATED +#endif + #if __GNUC__ #define GCC_FORMAT_CHECK(a,b) __attribute__ ((format(printf, a, b))) #else |
|
From: <svn...@op...> - 2010-01-04 20:30:59
|
Author: dgollub Date: Mon Jan 4 21:30:47 2010 New Revision: 5967 URL: http://www.opensync.org/changeset/5967 Log: Fixes demerger of second level xmlfields fixes #1183 Modified: format-plugins/xmlformat/trunk/src/xmlformat_merge.c format-plugins/xmlformat/trunk/tests/check_merger.c Modified: format-plugins/xmlformat/trunk/src/xmlformat_merge.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat_merge.c Mon Jan 4 21:15:22 2010 (r5966) +++ format-plugins/xmlformat/trunk/src/xmlformat_merge.c Mon Jan 4 21:30:47 2010 (r5967) @@ -223,18 +223,22 @@ int capability_keys = osync_list_length(osync_capability_get_childs(cur_capability)); int xmlfield_keys = osync_xmlfield_get_key_count(cur_xmlfield); - for(i=0; i < xmlfield_keys; i++) - { - int krc = 0; - if(j == capability_keys) { - for(; i < xmlfield_keys; i++) { - osync_trace(TRACE_INTERNAL, "Demerge XMLField Key: %s->%s", osync_xmlfield_get_name(cur_xmlfield), osync_xmlfield_get_nth_key_name(cur_xmlfield, i)); - osync_xmlfield_set_nth_key_value(cur_xmlfield, i, ""); - } - break; + OSyncXMLField *child_xmlfield = osync_xmlfield_get_child(cur_xmlfield); + + for(; child_xmlfield; child_xmlfield = osync_xmlfield_get_next(child_xmlfield)) { + int krc = 0; + if(j == capability_keys) { + for (; child_xmlfield; child_xmlfield = osync_xmlfield_get_next(child_xmlfield)) { + osync_trace(TRACE_INTERNAL, "Demerge XMLField Key: %s", osync_xmlfield_get_name(cur_xmlfield)); + osync_xmlfield_delete(child_xmlfield); } + break; + } + - krc = strcmp(osync_xmlfield_get_nth_key_name(cur_xmlfield, i), osync_list_nth_data(osync_capability_get_childs(cur_capability), j)); + OSyncCapability *child_cap = osync_list_nth_data(osync_capability_get_childs(cur_capability), j); + krc = strcmp(osync_xmlfield_get_name(child_xmlfield), osync_capability_get_name(child_cap)); + if(krc == 0) { continue; } @@ -243,8 +247,8 @@ continue; } if(krc < 0) { - osync_trace(TRACE_INTERNAL, "Demerge XMLField Key: %s->%s", osync_xmlfield_get_name(cur_xmlfield), osync_xmlfield_get_nth_key_name(cur_xmlfield, i)); - osync_xmlfield_set_nth_key_value(cur_xmlfield, i, ""); + osync_trace(TRACE_INTERNAL, "Demerge XMLField Key: %s", osync_xmlfield_get_name(child_xmlfield)); + osync_xmlfield_delete(child_xmlfield); continue; } g_assert_not_reached(); Modified: format-plugins/xmlformat/trunk/tests/check_merger.c ============================================================================== --- format-plugins/xmlformat/trunk/tests/check_merger.c Mon Jan 4 21:15:22 2010 (r5966) +++ format-plugins/xmlformat/trunk/tests/check_merger.c Mon Jan 4 21:30:47 2010 (r5967) @@ -8,6 +8,7 @@ static OSyncCapabilities *_merger_assemble_caps(void) { OSyncError *error; + OSyncCapability *cap, *child_cap; OSyncCapabilities *capabilities = osync_capabilities_new("xmlformat-caps", &error); fail_unless(capabilities != NULL, NULL); @@ -16,29 +17,34 @@ OSyncCapabilitiesObjType *capsobjtype = osync_capabilities_objtype_new(capabilities, "contact", &error); fail_unless(capsobjtype != NULL, NULL); - OSyncCapability *cap = osync_capability_new(capsobjtype, &error); - osync_capability_set_name(cap, "Name"); - cap = osync_capability_new(capsobjtype, &error); - osync_capability_set_name(cap, "LastName"); + osync_capability_set_name(cap, "Address"); - cap = osync_capability_new(capsobjtype, &error); - osync_capability_set_name(cap, "Telephone"); + child_cap = osync_capability_new_child(cap, &error); + osync_capability_set_name(child_cap, "City"); + + child_cap = osync_capability_new_child(cap, &error); + osync_capability_set_name(child_cap, "Region"); + + child_cap = osync_capability_new_child(cap, &error); + osync_capability_set_name(child_cap, "Street"); cap = osync_capability_new(capsobjtype, &error); osync_capability_set_name(cap, "Categories"); cap = osync_capability_new(capsobjtype, &error); - osync_capability_set_name(cap, "Address"); + osync_capability_set_name(cap, "Name"); - cap = osync_capability_new(capsobjtype, &error); - osync_capability_set_name(cap, "Street"); + child_cap = osync_capability_new_child(cap, &error); + osync_capability_set_name(child_cap, "FirstName"); + + child_cap = osync_capability_new_child(cap, &error); + osync_capability_set_name(child_cap, "LastName"); - cap = osync_capability_new(capsobjtype, &error); - osync_capability_set_name(cap, "City"); cap = osync_capability_new(capsobjtype, &error); - osync_capability_set_name(cap, "Region"); + osync_capability_set_name(cap, "Telephone"); + return capabilities; } @@ -99,6 +105,13 @@ OSyncXMLFormat *xmlformat, *xmlformat_entire; OSyncCapabilities *capabilities = _merger_assemble_caps(); + OSyncCapabilitiesObjType *capsobjtype = osync_capabilities_get_objtype(capabilities, "contact"); + OSyncList *caplist = osync_capabilities_objtype_get_caps(capsobjtype); + for (; caplist; caplist = caplist->next) { + OSyncCapability *cap_cur = (OSyncCapability *) caplist->data; + //printf("Capability: %s\n", osync_capability_get_name(cap_cur)); + } + fail_unless(osync_file_read("contact.xml", &buffer, &size, &error), NULL); xmlformat = osync_xmlformat_parse(buffer, size, &error); fail_unless(xmlformat != NULL, NULL); @@ -115,13 +128,13 @@ osync_xmlformat_sort(xmlformat_entire, &error); fail_unless(error == NULL, NULL); -//osync_xmlformat_assemble(xmlformat, &buffer, &size); printf("\n%s", buffer); g_free(buffer); -//osync_xmlformat_assemble(xmlformat_entire, &buffer, &size); printf("\n%s", buffer); g_free(buffer); +//osync_xmlformat_assemble(xmlformat, &buffer, &size, NULL); printf("XMLFORMAT:\n%s", buffer); g_free(buffer); +//osync_xmlformat_assemble(xmlformat_entire, &buffer, &size, NULL); printf("XMLFORMAT_ENTIRE\n%s", buffer); g_free(buffer); fail_unless(merge_xmlformat((char **) &xmlformat, &xmlformat_size, (char *) xmlformat_entire, osync_xmlformat_size(), capabilities, NULL, &error), NULL); -//osync_xmlformat_assemble(xmlformat, &buffer, &size); printf("\nMERGED:\n%s", buffer); g_free(buffer); - fail_unless(demerge_xmlformat((char **) &xmlformat, &xmlformat_size, capabilities, NULL, &error), NULL); -//osync_xmlformat_assemble(xmlformat, &buffer, &size); printf("\nDEMERGED:\n%s", buffer); g_free(buffer); +//osync_xmlformat_assemble(xmlformat, &buffer, &size, NULL); printf("\nMERGED:\n%s", buffer); g_free(buffer); + fail_unless(demerge_xmlformat((char **) &xmlformat_entire, &xmlformat_size, capabilities, NULL, &error), NULL); +//osync_xmlformat_assemble(xmlformat_entire, &buffer, &size, NULL); printf("\nDEMERGED:\n%s", buffer); g_free(buffer); osync_capabilities_unref(capabilities); osync_xmlformat_unref(xmlformat); |
|
From: <svn...@op...> - 2010-01-04 20:15:33
|
Author: dgollub Date: Mon Jan 4 21:15:22 2010 New Revision: 5966 URL: http://www.opensync.org/changeset/5966 Log: Fix issue in osync_xmlfield_new_xmlfield() when the first child pointer get always overwritten. This requires that the previous pointer (in this case the last child in the siblings-list) get retrieved via a new function: osync_xmlfield_get_last_child() see #1183 Modified: trunk/opensync/xmlformat/opensync_xmlfield.c trunk/opensync/xmlformat/opensync_xmlfield_internals.h Modified: trunk/opensync/xmlformat/opensync_xmlfield.c ============================================================================== --- trunk/opensync/xmlformat/opensync_xmlfield.c Mon Nov 30 20:34:22 2009 (r5965) +++ trunk/opensync/xmlformat/opensync_xmlfield.c Mon Jan 4 21:15:22 2010 (r5966) @@ -62,10 +62,15 @@ node->_private = xmlfield; if (parent) { - xmlfield->prev = parent->child; - if (xmlfield->prev) + xmlfield->prev = osync_xmlfield_get_last_child(parent); + + if (xmlfield->prev) { + osync_assert(xmlfield->prev->next == NULL); xmlfield->prev->next = xmlfield; - parent->child = xmlfield; + } + + if (parent->child == NULL) + parent->child = xmlfield; } @@ -297,6 +302,20 @@ return xmlfield->child; } +OSyncXMLField *osync_xmlfield_get_last_child(OSyncXMLField *xmlfield) +{ + OSyncXMLField *last = NULL; + osync_return_val_if_fail(xmlfield, NULL); + osync_return_val_if_fail(xmlfield->child, NULL); + + last = xmlfield->child; + + while (last->next) + last = last->next; + + return last; +} + const char *osync_xmlfield_get_value(OSyncXMLField *xmlfield) { osync_return_val_if_fail(xmlfield, ""); Modified: trunk/opensync/xmlformat/opensync_xmlfield_internals.h ============================================================================== --- trunk/opensync/xmlformat/opensync_xmlfield_internals.h Mon Nov 30 20:34:22 2009 (r5965) +++ trunk/opensync/xmlformat/opensync_xmlfield_internals.h Mon Jan 4 21:15:22 2010 (r5966) @@ -72,6 +72,13 @@ */ int osync_xmlfield_key_compare_stdlib(const void *key1, const void *key2); +/** + * @brief Get the last child xmlfield + * @param xmlfield Pointer to the xmlfield object + * @return A pointer to the last child xmlfield or NULL if there is no child xmlfield + */ +OSYNC_TEST_EXPORT OSyncXMLField *osync_xmlfield_get_last_child(OSyncXMLField *xmlfield); + /*@}*/ #endif /*OPENSYNC_XMLFIELD_INTERNALS_H_*/ |
|
From: <svn...@op...> - 2009-12-07 14:06:23
|
Author: bellmich Date: Mon Dec 7 15:06:07 2009 New Revision: 1356 URL: http://libsyncml.opensync.org/changeset/1356 Log: do not duplicate all received entries during slow sync Modified: trunk/tools/syncml-ds-tool.c Modified: trunk/tools/syncml-ds-tool.c ============================================================================== --- trunk/tools/syncml-ds-tool.c Tue Nov 10 17:39:33 2009 (r1355) +++ trunk/tools/syncml-ds-tool.c Mon Dec 7 15:06:07 2009 (r1356) @@ -999,7 +999,7 @@ { smlTrace(TRACE_ENTRY, "%s", __func__); GList *o = datastores; - /* If readOnly then data MUST NOT be send. */ + /* If readOnly then data MUST NOT be sent. */ for (;!readOnly && o;o=o->next) { SmlDsToolLocationType *datastore = o->data; if (!datastore->directory) @@ -1053,19 +1053,27 @@ /* fix indexes */ SmlChangeType changeType = SML_CHANGE_UNKNOWN; - if (!datastore->slow && original) + if (original) { /* potentially changed item */ if (strcmp(digest, original)) { /* changed item */ printf("\tItem %s was locally changed.\n", filename); - changeType = SML_CHANGE_REPLACE; - g_key_file_set_string(datastore->index, "change_index", filename, digest); - /* NOTICE: glib changed the return type of g_key_file_remove_key */ - g_key_file_remove_key(datastore->index, "last_index", filename, error); - if (*error) - goto error; + if (datastore->slow) + { + /* SLOWSYNC and a conflict => create a duplicate */ + printf("\tCONFLICT: SLOWSYNC => Creating a duplicate ...\n"); + changeType = SML_CHANGE_ADD; + g_key_file_set_string(datastore->index, "change_index", filename, digest); + } else { + changeType = SML_CHANGE_REPLACE; + g_key_file_set_string(datastore->index, "change_index", filename, digest); + /* NOTICE: glib changed the return type of g_key_file_remove_key */ + g_key_file_remove_key(datastore->index, "last_index", filename, error); + if (*error) + goto error; + } } else { /* nothing to do */ g_key_file_set_string(datastore->index, "committed_index", filename, digest); @@ -1172,8 +1180,8 @@ switch (type) { case SML_DATA_SYNC_SESSION_EVENT_ERROR: - writeSyncStatus(FALSE); g_message("ERROR: %s\n", error->message); + writeSyncStatus(FALSE); // g_error_free(error); exit(2); break; @@ -1526,6 +1534,7 @@ if (!g_file_set_contents(absolute_uid, data, strlen(data), error)) goto error; g_key_file_set_string(datastore->index, "last_index", safeUID, item_digest); + /* printf("\tDigest: %s\n", item_digest); */ printf("\tThe item was successfully written.\n"); break; case SML_CHANGE_DELETE: |
|
From: <svn...@op...> - 2009-11-30 19:33:15
|
Author: bricks Date: Mon Nov 30 20:33:01 2009 New Revision: 5964 URL: http://www.opensync.org/changeset/5964 Log: fixed some compiler warnings about: "format not a string literal and no format arguments" Modified: trunk/opensync/client/opensync_client_proxy.c trunk/opensync/group/opensync_group.c trunk/opensync/ipc/opensync_serializer.c Modified: trunk/opensync/client/opensync_client_proxy.c ============================================================================== --- trunk/opensync/client/opensync_client_proxy.c Mon Nov 16 06:46:20 2009 (r5963) +++ trunk/opensync/client/opensync_client_proxy.c Mon Nov 30 20:33:01 2009 (r5964) @@ -1080,7 +1080,7 @@ execlp("./osplugin", "osplugin", "-f", readfd, writefd, NULL); } - osync_trace(TRACE_INTERNAL, strerror(errno)); + osync_trace(TRACE_INTERNAL, "%s", strerror(errno)); osync_trace(TRACE_INTERNAL, "Unable to execute osplugin."); exit(1); } else { Modified: trunk/opensync/group/opensync_group.c ============================================================================== --- trunk/opensync/group/opensync_group.c Mon Nov 16 06:46:20 2009 (r5963) +++ trunk/opensync/group/opensync_group.c Mon Nov 30 20:33:01 2009 (r5964) @@ -387,7 +387,7 @@ group->lock_fd = 0; } else { osync_error_set(error, OSYNC_ERROR_IO_ERROR, "error setting lock: %s", g_strerror(errno)); - osync_trace(TRACE_INTERNAL, osync_error_print(error)); + osync_trace(TRACE_INTERNAL, "%s", osync_error_print(error)); } } else #else /* _WIN32 */ Modified: trunk/opensync/ipc/opensync_serializer.c ============================================================================== --- trunk/opensync/ipc/opensync_serializer.c Mon Nov 16 06:46:20 2009 (r5963) +++ trunk/opensync/ipc/opensync_serializer.c Mon Nov 30 20:33:01 2009 (r5964) @@ -606,7 +606,7 @@ osync_message_read_int(message, &error_type, error); osync_message_read_string(message, &msg, error); - osync_error_set(marshal_error, (OSyncErrorType)error_type, msg); + osync_error_set(marshal_error, (OSyncErrorType)error_type, "%s", msg); osync_free(msg); } |
|
From: <svn...@op...> - 2009-11-16 05:46:55
|
Author: dgollub Date: Mon Nov 16 06:46:20 2009 New Revision: 5963 URL: http://www.opensync.org/changeset/5963 Log: Revert redudant function declartion - introduced by r5962 Modified: trunk/opensync/mapping/opensync_mapping_entry_internals.h Modified: trunk/opensync/mapping/opensync_mapping_entry_internals.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping_entry_internals.h Fri Nov 13 17:16:10 2009 (r5962) +++ trunk/opensync/mapping/opensync_mapping_entry_internals.h Mon Nov 16 06:46:20 2009 (r5963) @@ -47,6 +47,4 @@ /*@}*/ -long long int osync_mapping_entry_get_member_id(OSyncMappingEntry *entry); - #endif /*OPENSYNC_MAPPING_ENTRY_INTERNALS_H_*/ |
|
From: <svn...@op...> - 2009-11-13 16:16:55
|
Author: dgollub Date: Fri Nov 13 17:16:10 2009 New Revision: 5962 URL: http://www.opensync.org/changeset/5962 Log: Updated tbl_changelog columns names to make clear which IDs are used. This also fixes the issue that the information which member reported the entry, which gets ignored, had which changetype. Modified: trunk/opensync/archive/opensync_archive.c trunk/opensync/archive/opensync_archive_internals.h trunk/opensync/engine/opensync_mapping_engine.c trunk/opensync/engine/opensync_mapping_engine_internals.h trunk/opensync/engine/opensync_obj_engine.c trunk/opensync/mapping/opensync_mapping_entry_internals.h Modified: trunk/opensync/archive/opensync_archive.c ============================================================================== --- trunk/opensync/archive/opensync_archive.c Thu Nov 12 21:16:42 2009 (r5961) +++ trunk/opensync/archive/opensync_archive.c Fri Nov 13 17:16:10 2009 (r5962) @@ -94,7 +94,7 @@ return TRUE; } - query = "CREATE TABLE tbl_changelog (objtype VARCHAR(64), id INTEGER, entryid INTEGER, changetype INTEGER, PRIMARY KEY (objtype, id) )"; + query = "CREATE TABLE tbl_changelog (objtype VARCHAR(64) NOT NULL, memberid INTEGER NOT NULL, mappingid INTEGER NOT NULL, changetype INTEGER NOT NULL, PRIMARY KEY (objtype, memberid, mappingid) )"; if (!osync_db_query(db, query, error)) { goto error; } @@ -478,26 +478,27 @@ return FALSE; } -osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **ids, OSyncList **changetypes, OSyncError **error) +osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **memberids, OSyncList **mappingids, OSyncList **changetypes, OSyncError **error) { OSyncList *result = NULL, *row = NULL, *column = NULL; char *query = NULL; char *escaped_objtype = NULL; - long long int id = 0; + long long int mappingid = 0, memberid = 0; int changetype = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, archive, objtype, ids, error); + osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, archive, objtype, mappingids, error); osync_assert(archive); osync_assert(objtype); - osync_assert(ids); + osync_assert(memberids); + osync_assert(mappingids); osync_assert(changetypes); if (!osync_archive_create_changelog(archive->db, objtype, error)) goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = osync_strdup_printf("SELECT entryid, changetype FROM tbl_changelog WHERE objtype='%s' ORDER BY id", escaped_objtype); + query = osync_strdup_printf("SELECT memberid, mappingid, changetype FROM tbl_changelog WHERE objtype='%s' ORDER BY mappingid", escaped_objtype); osync_free(escaped_objtype); escaped_objtype = NULL; result = osync_db_query_table(archive->db, query, error); @@ -511,13 +512,15 @@ for (row = result; row; row = row->next) { column = row->data; - id = g_ascii_strtoull(osync_list_nth_data(column, 0), NULL, 0); - changetype = atoi(osync_list_nth_data(column, 1)); + memberid = g_ascii_strtoull(osync_list_nth_data(column, 0), NULL, 0); + mappingid = atoi(osync_list_nth_data(column, 1)); + changetype = atoi(osync_list_nth_data(column, 2)); - *ids = osync_list_append((*ids), GINT_TO_POINTER((int)id)); + *memberids = osync_list_append((*memberids), GINT_TO_POINTER((int)memberid)); + *mappingids = osync_list_append((*mappingids), GINT_TO_POINTER((int)mappingid)); *changetypes = osync_list_append((*changetypes), GINT_TO_POINTER((int)changetype)); - osync_trace(TRACE_INTERNAL, "Loaded ignored mapping with entryid %lli", id); + osync_trace(TRACE_INTERNAL, "Loaded ignored mapping with mappingid %lli", mappingid); } osync_db_free_list(result); @@ -529,11 +532,11 @@ return FALSE; } -osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int id, OSyncChangeType changetype, OSyncError **error) +osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int memberid, long long int mappingid, OSyncChangeType changetype, OSyncError **error) { char *query = NULL; char *escaped_objtype = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %s, %lli, %p)", __func__, archive, objtype, id, error); + osync_trace(TRACE_ENTRY, "%s(%p, %s, %lli, %lli, %p)", __func__, archive, objtype, memberid, mappingid, error); osync_assert(archive); osync_assert(objtype); @@ -542,7 +545,7 @@ goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype, entryid, changetype) VALUES('%s', '%lli', '%i')", escaped_objtype, id, changetype); + query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype, memberid, mappingid, changetype) VALUES('%s', '%lli', '%lli', '%i')", escaped_objtype, memberid, mappingid, changetype); osync_free(escaped_objtype); escaped_objtype = NULL; @@ -553,7 +556,7 @@ osync_free(query); - osync_trace(TRACE_EXIT, "%s: %lli", __func__, id); + osync_trace(TRACE_EXIT, "%s: %lli", __func__, mappingid); return TRUE; error: Modified: trunk/opensync/archive/opensync_archive_internals.h ============================================================================== --- trunk/opensync/archive/opensync_archive_internals.h Thu Nov 12 21:16:42 2009 (r5961) +++ trunk/opensync/archive/opensync_archive_internals.h Fri Nov 13 17:16:10 2009 (r5962) @@ -136,24 +136,26 @@ * * @param archive The group archive * @param objtype Requested object type - * @param mappingsids List to store the archive (database) ids of each entry + * @param memberids List to store the member ids of each entry + * @param mappingsids List to store the mapping ids of each entry * @param changetypes List to store the changetypes for each entry * @param error Pointer to an error struct * @return TRUE on when all changes successfully loaded otherwise FALSE */ -osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **mappingsids, OSyncList **changetypes, OSyncError **error); +osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **memberids, OSyncList **mappingsids, OSyncList **changetypes, OSyncError **error); /** * @brief Saves an entry in the ignored conflict list. * * @param archive The group archive * @param objtype Reported object type of entry + * @param memberid Member ID of entry * @param mappingid Mapping Entry ID of entry * @param changetype Changetype of entry * @param error Pointer to an error struct * @return Returns TRUE on success, FALSE otherwise */ -osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int mappingid, OSyncChangeType changetype, OSyncError **error); +osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int memberid, long long int mappingid, OSyncChangeType changetype, OSyncError **error); /** * @brief Deletes all ignored conflict entries of the changelog with the objtype. Modified: trunk/opensync/engine/opensync_mapping_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.c Thu Nov 12 21:16:42 2009 (r5961) +++ trunk/opensync/engine/opensync_mapping_engine.c Fri Nov 13 17:16:10 2009 (r5962) @@ -126,6 +126,20 @@ } } +OSyncMappingEntryEngine *osync_mapping_engine_find_entry_by_memberid(OSyncMappingEngine *engine, long long int memberid) +{ + OSyncList *e; + for (e = engine->entries; e; e = e->next) { + OSyncMappingEntryEngine *entry = e->data; + + if (osync_mapping_entry_get_member_id(entry->entry) == memberid) + return entry; + } + + return NULL; +} + + static OSyncMappingEntryEngine *_osync_mapping_engine_find_entry(OSyncMappingEngine *engine, OSyncChange *change) { OSyncList *e; @@ -620,7 +634,7 @@ for (c = engine->entries; c; c = c->next) { OSyncMappingEntryEngine *entry = c->data; - osync_archive_save_ignored_conflict(archive, objtype, id, osync_change_get_changetype(entry->change), error); + osync_archive_save_ignored_conflict(archive, objtype, osync_mapping_entry_get_member_id(entry->entry), id, osync_change_get_changetype(entry->change), error); } osync_status_update_mapping(engine->parent->parent, engine, OSYNC_ENGINE_MAPPING_EVENT_SOLVED, NULL); Modified: trunk/opensync/engine/opensync_mapping_engine_internals.h ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine_internals.h Thu Nov 12 21:16:42 2009 (r5961) +++ trunk/opensync/engine/opensync_mapping_engine_internals.h Fri Nov 13 17:16:10 2009 (r5962) @@ -65,6 +65,7 @@ osync_bool osync_mapping_engine_check_conflict(OSyncMappingEngine *engine); OSyncMappingEntryEngine *osync_mapping_engine_get_entry(OSyncMappingEngine *engine, OSyncSinkEngine *sinkengine); +OSyncMappingEntryEngine *osync_mapping_engine_find_entry_by_memberid(OSyncMappingEngine *engine, long long int memberid); OSYNC_TEST_EXPORT unsigned int osync_mapping_engine_num_changes(OSyncMappingEngine *engine); Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Thu Nov 12 21:16:42 2009 (r5961) +++ trunk/opensync/engine/opensync_obj_engine.c Fri Nov 13 17:16:10 2009 (r5962) @@ -767,8 +767,8 @@ static osync_bool _inject_changelog_entries(OSyncObjEngine *engine, OSyncError **error) { OSyncList *ids = NULL; - OSyncList *changetypes = NULL; - OSyncList *j = NULL, *t = NULL; + OSyncList *changetypes = NULL, *memberids = NULL; + OSyncList *j = NULL, *t = NULL, *mid = NULL; osync_trace(TRACE_ENTRY, "%s(%p)", __func__, engine); @@ -776,12 +776,13 @@ osync_assert(engine->archive); osync_assert(engine->objtype); - if (!osync_archive_load_ignored_conflicts(engine->archive, engine->objtype, &ids, &changetypes, error)) { + if (!osync_archive_load_ignored_conflicts(engine->archive, engine->objtype, &memberids, &ids, &changetypes, error)) { osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error)); return FALSE; } t = changetypes; + mid = memberids; for (j = ids; j; j = j->next) { long long int id = (long long int)GPOINTER_TO_INT(j->data); @@ -793,8 +794,10 @@ if (mapping_engine->mapping == ignored_mapping) { OSyncList *m; + for (m = mapping_engine->entries; m; m = m->next) { - OSyncMappingEntryEngine *entry = m->data; + long long int memberid = (long long int)GPOINTER_TO_INT(mid->data); + OSyncMappingEntryEngine *entry = osync_mapping_engine_find_entry_by_memberid(mapping_engine, memberid); OSyncChangeType changetype = (OSyncChangeType) t->data; OSyncChange *ignored_change = osync_change_new(error); OSyncObjFormat *dummyformat = NULL; @@ -817,6 +820,7 @@ } t = t->next; + mid = mid->next; } osync_list_free(ids); Modified: trunk/opensync/mapping/opensync_mapping_entry_internals.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping_entry_internals.h Thu Nov 12 21:16:42 2009 (r5961) +++ trunk/opensync/mapping/opensync_mapping_entry_internals.h Fri Nov 13 17:16:10 2009 (r5962) @@ -47,4 +47,6 @@ /*@}*/ +long long int osync_mapping_entry_get_member_id(OSyncMappingEntry *entry); + #endif /*OPENSYNC_MAPPING_ENTRY_INTERNALS_H_*/ |
|
From: <svn...@op...> - 2009-11-12 20:17:00
|
Author: scriptor Date: Thu Nov 12 21:16:42 2009 New Revision: 5961 URL: http://www.opensync.org/changeset/5961 Log: I have added numerous casts to (void *) to silence recently added warnings. I have also fixed quite a few real bugs on that occasion. Modified: plugins/ldap-sync/misc/ldap_format_convert.c plugins/ldap-sync/src/ldap_connect.c plugins/ldap-sync/src/ldap_debug.c plugins/ldap-sync/src/ldap_format.c plugins/ldap-sync/src/ldap_plugin.c plugins/ldap-sync/src/ldap_sasl.c plugins/ldap-sync/tests/check_do_convert_from_to.c Modified: plugins/ldap-sync/misc/ldap_format_convert.c ============================================================================== --- plugins/ldap-sync/misc/ldap_format_convert.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/misc/ldap_format_convert.c Thu Nov 12 21:16:42 2009 (r5961) @@ -96,7 +96,7 @@ OSyncFormatEnv *env = (OSyncFormatEnv *)env_orig; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %p)", __func__, env_orig, sfname, type, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %p)", __func__, (void *)env_orig, (void *)sfname, type, (void *)error); if (env == NULL || env_orig == NULL) { @@ -664,7 +664,7 @@ OSyncXMLFormat *xmlformat = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p)", __func__, buffer, size, objtype, new_sourceformat_name, data, sourceformat, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p)", __func__, (void *)buffer, size, (void *)objtype, (void *)new_sourceformat_name, (void *)data, (void *)sourceformat, (void *)error); osync_trace(TRACE_INTERNAL, "%s:%i: Applying workaround.\n", __FILE__, __LINE__); @@ -705,7 +705,7 @@ if (!xmlformat) { osync_trace(TRACE_ERROR, "%s:%i: ERROR: osync_xmlformat_parse() has failed.\nFaulty input was:\n%.*s\n", __FILE__, __LINE__, size, buffer); if (!osync_error_is_set(error)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_xmlformat_parse() must have failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_xmlformat_parse() must have failed.", __FILE__, __LINE__); } goto error; @@ -716,7 +716,7 @@ if (!osync_xmlformat_sort(xmlformat, error)) { if (!osync_error_is_set(error)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_xmlformat_sort() has failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_xmlformat_sort() has failed.", __FILE__, __LINE__); } goto error; @@ -781,21 +781,21 @@ OSyncFormatEnv *format_env = (OSyncFormatEnv *) format_env_orig; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %i, %p, %p)", __func__, format_env_orig, data, sourceformat, detection_type, format_config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %i, %p, %p)", __func__, (void *)format_env_orig, (void *)data, (void *)sourceformat, detection_type, (void *)format_config, (void *)error); if (data == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } if (format_env == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_env = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_env = NULL.", __FILE__, __LINE__); goto error; } if (sourceformat == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: sourceformat = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: sourceformat = NULL.", __FILE__, __LINE__); goto error; } @@ -931,7 +931,7 @@ int i = 0; - osync_trace(TRACE_ENTRY, "%s(%i, %p)", __func__, argc, argv); + osync_trace(TRACE_ENTRY, "%s(%i, %p)", __func__, argc, (void *)argv); // Parse arguments Modified: plugins/ldap-sync/src/ldap_connect.c ============================================================================== --- plugins/ldap-sync/src/ldap_connect.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/src/ldap_connect.c Thu Nov 12 21:16:42 2009 (r5961) @@ -104,7 +104,7 @@ */ osync_bool ldap_plugin_do_connect (OSyncContext *ctx, sink_environment *sinkenv, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -224,7 +224,7 @@ osync_bool result = FALSE; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -390,7 +390,7 @@ OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)sink, (void *)info, (void *)ctx, (void *)userdata); if (userdata == NULL) { @@ -425,7 +425,7 @@ } - osync_trace(TRACE_INTERNAL, "%s:%i: sinkenv = %p", __FILE__, __LINE__, sinkenv); + osync_trace(TRACE_INTERNAL, "%s:%i: sinkenv = %p", __FILE__, __LINE__, (void *)sinkenv); @@ -565,7 +565,7 @@ */ osync_bool ldap_plugin_do_disconnect (OSyncContext *ctx, sink_environment *sinkenv, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -635,7 +635,7 @@ OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)sink, (void *)info, (void *)ctx, (void *)userdata); if (userdata == NULL) { @@ -704,7 +704,7 @@ { int *ldap_protocol_version = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, info, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)info, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -787,7 +787,7 @@ int ldap_errno = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -872,7 +872,7 @@ int ldap_errno = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -1171,10 +1171,10 @@ { LDAPMessage *res = NULL, *res2 = NULL; int i = 0; - struct berval ** ber = NULL; + struct berval **ber = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, ldap_schema, result, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)ldap_schema, (void *)result, (void *)error); if (ctx == NULL) { @@ -1337,7 +1337,7 @@ struct berval **ber = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -1514,7 +1514,7 @@ osync_bool ldap_plugin_call_ldap_search(OSyncContext *ctx, const LDAP *ldap_handle, const char *searchbase, const char *filter, const int scope, const int kind_of_attributes, const sink_environment *sinkenv, osync_bool ignore_no_such_object, LDAPMessage **results, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %d, %d, %p, %p)", __func__, ctx, ldap_handle, searchbase, filter, scope, kind_of_attributes, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %d, %d, %p, %p)", __func__, (void *)ctx, (void *)ldap_handle, (void *)searchbase, (void *)filter, scope, kind_of_attributes, (void *)sinkenv, (void *)error); const char *scope_str = NULL; @@ -1704,7 +1704,7 @@ LDAPMessage *all_results = NULL, *result = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, rv, dn, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)rv, (void *)dn, (void *)error); if (rv == NULL) { @@ -1918,7 +1918,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, msg, keyattr, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)msg, (void *)keyattr, (void *)error); @@ -2098,7 +2098,7 @@ ldap_entry *entry = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, ctx, sinkenv, entrylist, base, filter, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)entrylist, (void *)base, (void *)filter, (void *)error); if (base == NULL) { @@ -2302,7 +2302,7 @@ done: - osync_trace(TRACE_EXIT, "%s: *entrylist = %p", __func__, *entrylist); + osync_trace(TRACE_EXIT, "%s: *entrylist = %p", __func__, (void *) *entrylist); return TRUE; @@ -2342,7 +2342,7 @@ gchar *filter = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, entrylist); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)entrylist); if (ctx == NULL) { @@ -2393,7 +2393,7 @@ } - osync_trace(TRACE_EXIT, "%s: entrylist = %p", __func__, entrylist); + osync_trace(TRACE_EXIT, "%s: entrylist = %p", __func__, (void *)entrylist); return TRUE; @@ -2475,7 +2475,7 @@ OSyncHashTable *hashtable = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, sinkenv, all_uids, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)all_uids, (void *)error); if (all_uids == NULL) { @@ -2540,7 +2540,7 @@ char *filter = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (sinkenv == NULL) { @@ -2736,7 +2736,7 @@ char *actual_hash = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, ctx, sinkenv, base, filter, all_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)base, (void *)filter, (void *)all_entries, (void *)error); @@ -2863,7 +2863,7 @@ char *base = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, sinkenv, uid, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)uid, (void *)error); if (uid == NULL) { @@ -3012,7 +3012,7 @@ GList *uid = NULL, *present = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, uids_hashtable, uids_ldap_server, differing_entries); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)uids_hashtable, (void *)uids_ldap_server, (void *)differing_entries); if (sinkenv == NULL) { @@ -3149,7 +3149,7 @@ GList *uid = NULL, *present = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, uids_hashtable, uids_ldap_server, missing_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)uids_hashtable, (void *)uids_ldap_server, (void *)missing_entries, (void *)error); if (uids_hashtable == NULL) { goto out; @@ -3255,7 +3255,7 @@ GList *consumed_uids = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, ldapdata_modified, deleted_uids, unmodified_uids); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)ldapdata_modified, (void *)deleted_uids, (void *)unmodified_uids); if (ctx == NULL) { @@ -3515,7 +3515,7 @@ - osync_trace(TRACE_EXIT, "%s: ldapdata_added = %p", __func__, ldapdata_added); + osync_trace(TRACE_EXIT, "%s: ldapdata_added = %p", __func__, (void *)ldapdata_added); return TRUE; @@ -3555,7 +3555,7 @@ osync_bool found = FALSE; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, oldvals, newvals, modification, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)oldvals, (void *)newvals, (void *)modification, (void *)error); @@ -3660,7 +3660,7 @@ LDAPMod *ldap_plugin_create_ldap_mod (OSyncContext *ctx, int operation, char *ldap_attribute, struct berval **values, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, operation, ldap_attribute, values, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, (void *)ctx, operation, (void *)ldap_attribute, (void *)values, (void *)error); if (ldap_attribute == NULL) { @@ -3752,7 +3752,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, entry, modifications, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)entry, (void *)modifications, (void *)error); if (entry == NULL) { @@ -3878,7 +3878,7 @@ GList *modifications = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, sinkenv, check_entry, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)check_entry, (void *)error); if (check_entry == NULL) { @@ -4210,7 +4210,7 @@ osync_bool found_attribute = FALSE; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, entry, ldap_attribute, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)entry, (void *)ldap_attribute, (void *)error); if (entry == NULL) { @@ -4371,7 +4371,7 @@ gchar **required = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sinkenv, entry, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)sinkenv, (void *)entry, (void *)error); if (sinkenv == NULL) { @@ -4556,7 +4556,7 @@ LDAPMessage *messages = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, hash, sinkenv, entry, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)hash, (void *)sinkenv, (void *)entry, (void *)error); if (hash == NULL) { Modified: plugins/ldap-sync/src/ldap_debug.c ============================================================================== --- plugins/ldap-sync/src/ldap_debug.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/src/ldap_debug.c Thu Nov 12 21:16:42 2009 (r5961) @@ -229,7 +229,7 @@ glist_container *container = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, unknown, list, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)unknown, (void *)list, (void *)error); if (unknown == NULL) { @@ -270,7 +270,7 @@ *list = container->list; - osync_trace(TRACE_EXIT, "%s(): *list = %p", __func__, *list); + osync_trace(TRACE_EXIT, "%s(): *list = %p", __func__, (void *) *list); return TRUE; error: @@ -649,7 +649,7 @@ */ osync_bool ldap_plugin_check_for_mod_op(ldap_entry *entry, int *mod_op_rv, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, entry, mod_op_rv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)entry, (void *)mod_op_rv, (void *)error); int i = 0; @@ -728,7 +728,7 @@ int k; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p)", __func__, string, len, buffer, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p)", __func__, (void *)string, len, (void *)buffer, (void *)error); @@ -815,7 +815,7 @@ } - osync_trace(TRACE_EXIT, "%s(): *buffer = %p", __func__, *buffer); + osync_trace(TRACE_EXIT, "%s(): *buffer = %p", __func__, (void *) *buffer); return TRUE; Modified: plugins/ldap-sync/src/ldap_format.c ============================================================================== --- plugins/ldap-sync/src/ldap_format.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/src/ldap_format.c Thu Nov 12 21:16:42 2009 (r5961) @@ -116,7 +116,7 @@ GList *list = NULL; - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ldapmods); + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, (void *)ldapmods); if (ldapmods == NULL) { @@ -179,7 +179,7 @@ int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, entry); + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, (void *)entry); if (entry == NULL) { @@ -248,7 +248,7 @@ unsigned int i; - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, entrylist); + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, (void *)entrylist); if (entrylist == NULL) { @@ -372,7 +372,7 @@ unsigned int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ldapmods, name); + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, (void *)ldapmods, (void *)name); if (ldapmods == NULL) { @@ -434,7 +434,7 @@ static GList *ldap_format_append_ldapmod(GList *list, gchar *ldapattr, gchar *value) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, list, ldapattr, value); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)list, (void *)ldapattr, (void *)value); @@ -517,7 +517,7 @@ out: - osync_trace(TRACE_EXIT, "%s(): list = %p", __func__, list); + osync_trace(TRACE_EXIT, "%s(): list = %p", __func__, (void *)list); return list; } @@ -543,7 +543,7 @@ unsigned int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ldapmods); + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, (void *)ldapmods); @@ -588,7 +588,7 @@ out: - osync_trace(TRACE_EXIT, "%s(): entry = %p", __func__, entry); + osync_trace(TRACE_EXIT, "%s(): entry = %p", __func__, (void *)entry); return entry; } @@ -617,7 +617,7 @@ unsigned int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, dn, ldapmods, potential_subentries, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)dn, (void *)ldapmods, (void *)potential_subentries, (void *)ldap_entries, (void *)error); @@ -845,7 +845,7 @@ xmlNode *attribute_node = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, xmlnode, attr1_name, attr1_value, attr2_name, attr2_value, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)xmlnode, (void *)attr1_name, (void *)attr1_value, (void *)attr2_name, (void *)attr2_value, (void *)error); if (xmlnode == NULL) { @@ -1001,7 +1001,7 @@ gchar *new_name = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ptr, name, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ptr, (void *)name, (void *)error); if (ptr == NULL) { @@ -1107,7 +1107,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, xmlnode, dn, element_lists, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)xmlnode, (void *)dn, (void *)element_lists, (void *)ldap_entries, (void *)error); @@ -1522,7 +1522,7 @@ #endif - osync_trace(TRACE_EXIT, "%s(): ldap_entries = %p", __func__, ldap_entries); + osync_trace(TRACE_EXIT, "%s(): ldap_entries = %p", __func__, (void *)ldap_entries); return TRUE; @@ -1600,7 +1600,7 @@ static OSyncConvCmpResult ldap_format_compare_format1(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %u, %p, %p) TODO ", __func__, leftdata, leftsize, rightdata, rightsize, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %u, %p, %p) TODO ", __func__, (void *)leftdata, leftsize, (void *)rightdata, rightsize, (void *)user_data, (void *)error); osync_trace(TRACE_EXIT, "%s", __func__); @@ -1630,7 +1630,7 @@ char *objtype = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, input, inpsize, xmlformat, str, stylesheet_file, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)xmlformat, (void *)str, (void *)stylesheet_file, (void *)error); if (!strcmp(stylesheet_file, STYLESHEET_LDAP_EVOLUTIONPERSON2XMLFORMAT_CONTACT)) { @@ -1732,7 +1732,7 @@ xmlSchemaPtr xsd = NULL; xmlSchemaParserCtxtPtr xsd_file = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, input, inpsize, xmlcard, stylesheet_file, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)xmlcard, (void *)stylesheet_file, (void *)error); if (input == NULL) { @@ -1962,7 +1962,7 @@ static osync_bool ldap_format_check_adequate_stylesheet(xmlNode *root_element, const char *stylesheet_file, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, root_element, stylesheet_file, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)root_element, (void *)stylesheet_file, (void *)error); if (!root_element) { @@ -2194,7 +2194,7 @@ xsltStylesheetPtr stylesheet_ptr = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, config, userdata, stylesheet_file, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)config, (void *)userdata, (void *)stylesheet_file, (void *)error); if (config) { if (config[0]) { @@ -2410,7 +2410,7 @@ OSyncXMLFormat *xmlformat = osync_xmlformat_parse((char *)xmlbuffer, xmlbuffer_size + 1, error); - osync_trace(TRACE_INTERNAL, "%s:%i: xmlformat = %p", __FILE__, __LINE__, xmlformat); + osync_trace(TRACE_INTERNAL, "%s:%i: xmlformat = %p", __FILE__, __LINE__, (void *)xmlformat); osync_trace(TRACE_INTERNAL, "%s:%i: This needs to be freed eventually. But by whom? And where and when exactly?", __FILE__, __LINE__); @@ -2594,7 +2594,7 @@ */ static osync_bool ldap_format_apply_stylesheet_workaround(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, const char *config, void *userdata, const char *stylesheet, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, config, userdata, stylesheet, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)config, userdata, (void *)stylesheet, (void *)error); if (stylesheet == NULL) { @@ -2689,7 +2689,7 @@ xmlNode *secondchild = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p)", __func__, root_node, name, value, attr1_name, attr1_value, attr2_name, attr2_value, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)root_node, (void *)name, (void *)value, (void *)attr1_name, (void *)attr1_value, (void *)attr2_name, (void *)attr2_value, (void *)error); @@ -2776,7 +2776,7 @@ xmlNode *possible_parent = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, root_node, token, name, value, attr1_name, attr1_value, attr2_name, attr2_value, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)root_node, (void *)token, (void *)name, (void *)value, (void *)attr1_name, (void *)attr1_value, (void *)attr2_name, (void *)attr2_value, (void *)error); if (root_node == NULL) { @@ -2925,7 +2925,7 @@ osync_bool ldap_plugin_parse_attribute_list(const int entry_list_index, const LDAPMod *mod, xmlChar **name, xmlChar **value, xmlChar **attr1_name, xmlChar **attr1_value, xmlChar **attr2_name, xmlChar **attr2_value, osync_bool *call_continue, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%i, %p, %p, %p, %p, %p, %p, %p, %i, %p)", __func__, entry_list_index, mod, name, value, attr1_name, attr1_value, attr2_name, attr2_value, call_continue, error); + osync_trace(TRACE_ENTRY, "%s(%i, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, entry_list_index, (void *)mod, (void *)name, (void *)value, (void *)attr1_name, (void *)attr1_value, (void *)attr2_name, (void *)attr2_value, (void *)call_continue, (void *)error); if (mod == NULL) { @@ -3152,7 +3152,7 @@ unsigned int i = 0, j = 0, k = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ldap_entries, objtype, ldap_format_name, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ldap_entries, (void *)objtype, (void *)ldap_format_name, (void *)error); if (ldap_entries == NULL) { @@ -3329,7 +3329,7 @@ // would have been defined. if (!ldap_plugin_parse_attribute_list(i, mod, &name, &value, &attr1_name, &attr1_value, &attr2_name, &attr2_value, &call_continue, error)) { if (!osync_error_is_set(error)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: %s:%i: ldap_plugin_parse_attribute_list() has failed.", __FILE__, __LINE__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_parse_attribute_list() has failed.", __FILE__, __LINE__); } goto error; @@ -3693,7 +3693,7 @@ #endif - osync_trace(TRACE_EXIT, "%s(): doc = %p", __func__, doc); + osync_trace(TRACE_EXIT, "%s(): doc = %p", __func__, (void *)doc); return doc; @@ -3732,7 +3732,7 @@ static osync_bool ldap_format_check_root_element(const xmlDoc *xmldata, const char *objtype, const char *ldap_format_name, const gchar *dn, xmlNode **root, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, xmldata, objtype, ldap_format_name, dn, root, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)xmldata, (void *)objtype, (void *)ldap_format_name, (void *)dn, (void *)root, (void *)error); if (xmldata == NULL) { @@ -3856,7 +3856,7 @@ - osync_trace(TRACE_EXIT, "%s(): *root = %p, (*root)->name = \"%s\"", __func__, *root, (*root)->name); + osync_trace(TRACE_EXIT, "%s(): *root = %p, (*root)->name = \"%s\"", __func__, (void *) *root, (*root)->name); return TRUE; error: @@ -3904,7 +3904,7 @@ */ static osync_bool ldap_format_parse_xmlinternal_child_nodes(xmlNode *xmlnode, const char *objtype, const char *dn, complex_elements *complex_element_lists, GList **potential_subentries, GList **ldapmods, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p)", __func__, xmlnode, objtype, dn, complex_element_lists, potential_subentries, ldapmods, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p)", __func__, (void *)xmlnode, (void *)objtype, (void *)dn, (void *)complex_element_lists, (void *)potential_subentries, (void *)ldapmods, (void *)error); if (ldapmods == NULL) { @@ -4242,7 +4242,7 @@ #endif - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p)", __func__, xmldata, objtype, ldap_format_name, dn, potential_subentries, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p)", __func__, (void *)xmldata, (void *)objtype, (void *)ldap_format_name, (void *)dn, (void *)potential_subentries, (void *)ldap_entries, (void *)error); @@ -4365,7 +4365,7 @@ } - osync_trace(TRACE_INTERNAL, "%s:%i: ldapmods = %p, potential_subentries = %p, ldap_entries = %p", __FILE__, __LINE__, ldapmods, potential_subentries, ldap_entries); + osync_trace(TRACE_INTERNAL, "%s:%i: ldapmods = %p, potential_subentries = %p, ldap_entries = %p", __FILE__, __LINE__, (void *)ldapmods, (void *)potential_subentries, (void *)ldap_entries); @@ -4427,7 +4427,7 @@ } - osync_trace(TRACE_EXIT, "%s(): xmlcard = %p", __func__, xmlcard); + osync_trace(TRACE_EXIT, "%s(): xmlcard = %p", __func__, (void *)xmlcard); return xmlcard; } @@ -4438,8 +4438,8 @@ * of LDAP entries. * * This function initiates the second step out of two steps - * necessary for conversion from the XML format used by libopensync - * into a list LDAP entries suitable for libopenldap. It is called + * necessary for converting from the XML format used by libopensync + * into a list of LDAP entries suitable for libldap. It is being called * after the stylesheet has been applied. * * @param xmlformat The xmlformat object as it results from applying @@ -4465,7 +4465,7 @@ char *dn = (char *)""; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, xmlformat, objtype, ldap_format_name, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)xmlformat, (void *)objtype, (void *)ldap_format_name, (void *)ldap_entries, (void *)error); if (xmlformat == NULL) { @@ -4562,7 +4562,7 @@ pre_output = NULL; } - osync_trace(TRACE_EXIT, "%s(): *ldap_entries = %p", __func__, *ldap_entries); + osync_trace(TRACE_EXIT, "%s(): *ldap_entries = %p", __func__, (void *) *ldap_entries); return TRUE; @@ -4717,7 +4717,7 @@ GList *list = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, ldap_format_name, xmlformat_name, stylesheet_name, objtype, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)ldap_format_name, (void *)xmlformat_name, (void *)stylesheet_name, (void *)objtype, (void *)config, (void *)userdata, (void *)error); @@ -4977,7 +4977,7 @@ */ static osync_bool ldap_format_conv_ldap_evolutionperson_to_xmlformat_contact(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5036,7 +5036,7 @@ */ static osync_bool ldap_format_conv_ldap_inetorgperson_to_xmlformat_contact(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5124,7 +5124,7 @@ glist_container *container = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, xmlformat_name, ldap_format_name, stylesheet_name, objtype, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)xmlformat_name, (void *)ldap_format_name, (void *)stylesheet_name, (void *)objtype, (void *)config, (void *)userdata, (void *)error); if (input == NULL) { @@ -5286,7 +5286,7 @@ static osync_bool ldap_format_conv_xmlformat_contact_to_ldap_evolution_person(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); if (config) { if (config[0]) { @@ -5356,7 +5356,7 @@ static osync_bool ldap_format_conv_xmlformat_contact_to_ldap_inetorg_person(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); if (config) { if (config[0]) { @@ -5428,8 +5428,7 @@ static osync_bool ldap_format_conv_ldap_event_to_xmlformat_event(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); - + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); @@ -5481,7 +5480,7 @@ static osync_bool ldap_format_conv_xmlformat_event_to_ldap_event(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5540,7 +5539,7 @@ static osync_bool ldap_format_conv_ldap_todo_to_xmlformat_todo(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5592,7 +5591,7 @@ static osync_bool ldap_format_conv_xmlformat_todo_to_ldap_todo(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5653,7 +5652,7 @@ static osync_bool ldap_format_conv_ldap_note_to_xmlformat_note(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5712,7 +5711,7 @@ static osync_bool ldap_format_conv_xmlformat_note_to_ldap_note(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5793,14 +5792,14 @@ static osync_bool ldap_format_destroy_format1(char *input , unsigned int inpsize, void *user_data, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p) TODO ", __func__, input, inpsize, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p) TODO ", __func__, (void *)input, inpsize, (void *)user_data, (void *)error); - osync_trace(TRACE_INTERNAL, "%s:%i:%s():\n\n\ndestroy function has been called for input = %p\n\n\n", __FILE__, __LINE__, __func__, input); + osync_trace(TRACE_INTERNAL, "%s:%i:%s():\n\n\ndestroy function has been called for input = %p\n\n\n", __FILE__, __LINE__, __func__, (void *)input); // First off, try and find out what type of data has been casted to char * - osync_trace(TRACE_INTERNAL, "%s:%i: What is input? inpsize = %i", __FILE__, __LINE__, inpsize); + osync_trace(TRACE_INTERNAL, "%s:%i: What is input? inpsize = %u", __FILE__, __LINE__, inpsize); GString *str = NULL; @@ -5880,7 +5879,7 @@ static osync_bool ldap_format_duplicate_format1(const char *uid, const char *input, unsigned int insize, char **newuid, char **output, unsigned int *outsize, osync_bool *dirty, void *user_data, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %u, %p, %p, %p, %p, %p, %p) TODO ", __func__, uid, input, insize, newuid, output, outsize, dirty, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %u, %p, %p, %p, %p, %p, %p) TODO ", __func__, (void *)uid, (void *)input, insize, (void *)newuid, (void *)output, (void *)outsize, (void *)dirty, (void *)user_data, (void *)error); ldap_plugin_printf("\n\n\n\n%s:%i: %s() has been called.\n\n\n\n", __FILE__, __LINE__, __func__); @@ -5924,7 +5923,7 @@ unsigned int xmlbuff_size = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p) ", __func__, data, size, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p) ", __func__, (void *)data, size, (void *)user_data, (void *)error); @@ -6027,7 +6026,7 @@ // unreachable - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: Don't know what that is. Bailing out."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: Don't know what that is. Bailing out.", __FILE__, __LINE__); goto error; } @@ -6111,7 +6110,7 @@ osync_trace(TRACE_INTERNAL, "%s:%i:%s():\nstr->str = \"%s\"\n", __FILE__, __LINE__, __func__, str->str); } - osync_trace(TRACE_EXIT, "%s(): str = %p, str->str = %p", __func__, str, str->str); + osync_trace(TRACE_EXIT, "%s(): str = %p, str->str = %p", __func__, (void *)str, str->str); return (char *)str->str; @@ -6143,7 +6142,7 @@ osync_bool rv = TRUE; - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p)", __func__, data, size, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p)", __func__, (void *)data, size, (void *)user_data, (void *)error); osync_trace(TRACE_EXIT, "%s: %s", __func__, rv ? "TRUE" : "FALSE"); return rv; @@ -6172,12 +6171,12 @@ GError *gerror = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, size, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, (void *)data, size, (void *)error); if (data == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6276,42 +6275,42 @@ osync_bool ldap_format_do_detect_plain_as_ldap_format(const char *data, const int size, const char *format_name, const char *opening_tag, const char *closing_tag, const void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, data, size, format_name, opening_tag, closing_tag, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, (void *)data, size, (void *)format_name, (void *)opening_tag, (void *)closing_tag, (void *)userdata, (void *)error); if (data == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } if (format_name == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_name = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_name = NULL.", __FILE__, __LINE__); goto error; } if (format_name[0] == 0) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_name[0] = 0."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_name[0] = 0.", __FILE__, __LINE__); goto error; } if (opening_tag == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: opening_tag = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: opening_tag = NULL.", __FILE__, __LINE__); goto error; } if (opening_tag[0] == 0) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: opening_tag[0] = 0."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: opening_tag[0] = 0.", __FILE__, __LINE__); goto error; } if (closing_tag == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: closing_tag = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: closing_tag = NULL.", __FILE__, __LINE__); goto error; } if (closing_tag[0] == 0) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: closing_tag[0] = 0."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: closing_tag[0] = 0.", __FILE__, __LINE__); goto error; } @@ -6537,7 +6536,7 @@ if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6602,11 +6601,11 @@ OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, size, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, (void *)data, size, userdata); if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6669,11 +6668,11 @@ OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, size, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, (void *)data, size, userdata); if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6736,11 +6735,11 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, size, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, (void *)data, size, userdata); if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6811,7 +6810,7 @@ osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, size, userdata); if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6868,7 +6867,7 @@ */ osync_bool get_format_info(OSyncFormatEnv *env, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, env, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, (void *)env, (void *)error); @@ -7030,8 +7029,7 @@ - - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p)", __func__, env, format_name, other_format_name, objtype, converter1, converter2, detector_function, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)env, (void *)format_name, (void *)other_format_name, (void *)objtype, (void *)error); if (env == NULL) { @@ -7070,7 +7068,7 @@ if (detector_function) { - osync_trace(TRACE_INTERNAL, "%s:%i: Setting detector_function for format \"%s\" against \"plain\". detector_function = %p.", __FILE__, __LINE__, format_name, detector_function); + osync_trace(TRACE_INTERNAL, "%s:%i: Setting detector_function for format \"%s\" against \"plain\".", __FILE__, __LINE__, format_name); plain = osync_format_env_find_objformat(env, "plain"); if (!plain) { @@ -7145,7 +7143,7 @@ osync_converter_unref(conv); - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): Registering conversion from \"%s\" to \"%s\" for objtype \"%s\" with the converter function being located at address %p\n", __FILE__, __LINE__, __func__, format_name, other_format_name, objtype, converter1); + osync_trace(TRACE_INTERNAL, "%s:%i:%s(): Registering conversion from \"%s\" to \"%s\" for objtype \"%s\".", __FILE__, __LINE__, __func__, format_name, other_format_name, objtype); conv = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format1, converter2, error); @@ -7169,7 +7167,7 @@ osync_converter_unref(conv); - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): Registering conversion from \"%s\" to \"%s\" for objtype \"%s\" with the converter function being located at address %p\n", __FILE__, __LINE__, __func__, other_format_name, format_name, objtype, converter2); + osync_trace(TRACE_INTERNAL, "%s:%i:%s(): Registering conversion from \"%s\" to \"%s\" for objtype \"%s\".", __FILE__, __LINE__, __func__, other_format_name, format_name, objtype); @@ -7198,17 +7196,13 @@ */ osync_bool get_conversion_info(OSyncFormatEnv *env, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, env, error); - - - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_CONTACT); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_evolutionperson_to_xmlformat_contact() is located at address %p\n", ldap_format_conv_ldap_evolutionperson_to_xmlformat_contact); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_contact_to_ldap_evolution_person() is located at address %p\n", ldap_format_conv_xmlformat_contact_to_ldap_evolution_person); + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, (void *)env, (void *)error); const char *path = LDAP_PLUGIN_OPENSYNC_CONFIGDIR; struct stat stat_buffer; + errno = 0; if (stat(path, &stat_buffer)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: Path \"%s\" could not be found: %s. The constant LDAP_PLUGIN_OPENSYNC_CONFIGDIR is not correctly set. Please rerun cmake and check the resulting config.h for LDAP_PLUGIN_OPENSYNC_CONFIGDIR.\n", __FILE__, __LINE__, path, strerror(errno)); @@ -7238,14 +7232,6 @@ - - - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_CONTACT); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_inetorgperson_to_xmlformat_contact() is located at address %p\n", ldap_format_conv_ldap_inetorgperson_to_xmlformat_contact); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_contact_to_ldap_inetorg_person() is located at address %p\n", ldap_format_conv_xmlformat_contact_to_ldap_inetorg_person); - - - if ( !ldap_format_do_get_conversion_info( env, @@ -7267,20 +7253,6 @@ - - - - - - - - - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_EVENT); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_event_to_xmlformat_event() is located at address %p\n", ldap_format_conv_ldap_event_to_xmlformat_event); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_event_to_ldap_event() is located at address %p\n", ldap_format_conv_xmlformat_event_to_ldap_event); - - - if ( !ldap_format_do_get_conversion_info( env, @@ -7302,12 +7274,6 @@ - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_TODO); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_todo_to_xmlformat_todo() is located at address %p\n", ldap_format_conv_ldap_todo_to_xmlformat_todo); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_todo_to_ldap_todo() is located at address %p\n", ldap_format_conv_xmlformat_todo_to_ldap_todo); - - - if ( !ldap_format_do_get_conversion_info( env, @@ -7329,14 +7295,6 @@ - - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_NOTE); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_note_to_xmlformat_note() is located at address %p\n", ldap_format_conv_ldap_note_to_xmlformat_note); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_note_to_ldap_note() is located at address %p\n", ldap_format_conv_xmlformat_note_to_ldap_note); - - - - if ( !ldap_format_do_get_conversion_info( env, Modified: plugins/ldap-sync/src/ldap_plugin.c ============================================================================== --- plugins/ldap-sync/src/ldap_plugin.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/src/ldap_plugin.c Thu Nov 12 21:16:42 2009 (r5961) @@ -290,7 +290,8 @@ */ osync_bool ldap_plugin_get_sinkenv(OSyncContext *ctx, OSyncObjTypeSink *sink, void *userdata, sink_environment **sinkenv, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sink, userdata, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sink, (void *)userdata, (void *)sinkenv, (void *)error); + if (ctx == NULL) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ctx = NULL.", __FILE__, __LINE__); @@ -376,7 +377,7 @@ } osync_trace(TRACE_ERROR, "%s:%i: ERROR: userdata->magic = \"%.10s\" = \"%.10s\"", __FILE__, __LINE__, ((sink_environment *)userdata)->magic, ((plugin_environment *)userdata)->magic); - osync_trace(TRACE_ERROR, "%s:%i: ERROR: strlen(userdata->magic) = %u", __FILE__, __LINE__, strlen(((sink_environment *)userdata)->magic)); + osync_trace(TRACE_ERROR, "%s:%i: ERROR: strlen(userdata->magic) = %u", __FILE__, __LINE__, (unsigned int) strlen(((sink_environment *)userdata)->magic)); } @@ -430,7 +431,8 @@ { char *timestamp = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -625,7 +627,7 @@ OSyncPluginConnection *conn = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, info, sinkenv, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)info, (void *)sinkenv, (void *)config, (void *)error); @@ -1029,8 +1031,8 @@ if (objtype) osync_trace(TRACE_INTERNAL, "Objtype: \"%s\"", objtype); - osync_trace(TRACE_INTERNAL, "sinkenv->sink = %p", sinkenv->sink); - osync_trace(TRACE_INTERNAL, "sinkenv->objformat = %p", sinkenv->objformat); + osync_trace(TRACE_INTERNAL, "sinkenv->sink = %p", (void *)sinkenv->sink); + osync_trace(TRACE_INTERNAL, "sinkenv->objformat = %p", (void *)sinkenv->objformat); if (sinkenv->servername) osync_trace(TRACE_INTERNAL, "sinkenv->servername = \"%s\"", sinkenv->servername); @@ -1174,7 +1176,7 @@ GList *ldap_plugin_append_ldapmod(GList *list, gchar *ldapattr, gchar *value) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, list, ldapattr, value); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)list, (void *)ldapattr, (void *)value); @@ -1250,7 +1252,7 @@ out: - osync_trace(TRACE_EXIT, "%s(): list = %p", __func__, list); + osync_trace(TRACE_EXIT, "%s(): list = %p", __func__, (void *)list); return list; } @@ -1280,7 +1282,7 @@ osync_bool rv = TRUE; - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p)", __func__, data, size, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p)", __func__, (void *)data, size, (void *)user_data, (void *)error); osync_trace(TRACE_EXIT, "%s: %s", __func__, rv ? "TRUE" : "FALSE"); @@ -1320,7 +1322,8 @@ glist_container *to_be_reported = NULL; OSyncHashTable *hashtable = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %i, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, changetype_from_caller, list_to_be_reported, error); + + osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %i, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, slow_sync_requested, changetype_from_caller, (void *)list_to_be_reported, (void *)error); if (ctx == NULL) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ctx = NULL.", __FILE__, __LINE__); @@ -1507,7 +1510,7 @@ ptr[sizeof(glist_container)] = 0; osync_assert(to_be_reported); - osync_trace(TRACE_INTERNAL, "%s:%i: sizeof(*to_be_reported) = %u", __FILE__, __LINE__, sizeof(*to_be_reported)); + osync_trace(TRACE_INTERNAL, "%s:%i: sizeof(*to_be_reported) = %lu", __FILE__, __LINE__, sizeof(*to_be_reported)); if (sizeof(*to_be_reported) == 0) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: sizeof(*to_be_reported) is 0.\n", __FILE__, __LINE__); osync_change_unref(change); @@ -1619,7 +1622,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, info, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)info, (void *)sinkenv, (void *)error); @@ -1752,7 +1755,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, ldaplist_added, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, slow_sync_requested, (void *)ldaplist_added, (void *)error); if (ctx == NULL) { @@ -1976,7 +1979,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, ldaplist_deleted, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, slow_sync_requested, (void *)ldaplist_deleted, (void *)error); for (i = 0; i < g_list_length(ldaplist_deleted) ; i++) { @@ -2073,7 +2076,7 @@ OSyncHashTable *hashtable = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, unmodified_uids, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, slow_sync_requested, (void *)unmodified_uids, (void *)error); @@ -2175,7 +2178,8 @@ { OSyncHashTable *hashtable = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p, %p, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, ldaplist_added, ldaplist_modified, deleted_uids, unmodified_uids, error); + + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)slow_sync_requested, (void *)ldaplist_added, (void *)ldaplist_modified, (void *)deleted_uids, (void *)unmodified_uids, (void *)error); if (ctx == NULL) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ctx = NULL. \n", __FILE__, __LINE__); @@ -2251,7 +2255,7 @@ } - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, ldaplist_added); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, (void *)ldaplist_added); } else @@ -2272,10 +2276,10 @@ goto error; } - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, ldaplist_added); - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_modified = %p", __FILE__, __LINE__, ldaplist_modified); - osync_trace(TRACE_INTERNAL, "%s:%i: deleted_uids = %p", __FILE__, __LINE__, deleted_uids); - osync_trace(TRACE_INTERNAL, "%s:%i: unmodified_uids = %p", __FILE__, __LINE__, unmodified_uids); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, (void *)ldaplist_added); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_modified = %p", __FILE__, __LINE__, (void *)ldaplist_modified); + osync_trace(TRACE_INTERNAL, "%s:%i: deleted_uids = %p", __FILE__, __LINE__, (void *)deleted_uids); + osync_trace(TRACE_INTERNAL, "%s:%i: unmodified_uids = %p", __FILE__, __LINE__, (void *)unmodified_uids); } @@ -2349,7 +2353,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %d, %p)", __func__, sink, info, ctx, slow_sync_requested, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %d, %p)", __func__, (void *)sink, (void *)info, (void *)ctx, slow_sync_requested, (void *)userdata); #ifdef DEBUG_ldapdata_from_server ldap_plugin_printf("%s:%i: ----------- Inside ldap_plugin_get_changes() --------------", __FILE__, __LINE__); @@ -2414,8 +2418,8 @@ osync_trace(TRACE_INTERNAL, "%s:%i:%s():", __FILE__, __LINE__, __func__); - osync_trace(TRACE_INTERNAL, "sink = %p", sink); - osync_trace(TRACE_INTERNAL, "sinkenv->sink = %p", sinkenv->sink); + osync_trace(TRACE_INTERNAL, "sink = %p", (void *)sink); + osync_trace(TRACE_INTERNAL, "sinkenv->sink = %p", (void *)(sinkenv->sink)); if (sinkenv->sink) { osync_trace(TRACE_INTERNAL, "%s: Is this sink (%s) enabled? %d", __func__, osync_objtype_sink_get_name(sinkenv->sink), osync_objtype_sink_is_enabled(sinkenv->sink)); } @@ -2445,10 +2449,10 @@ - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, ldaplist_added); - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_modified = %p", __FILE__, __LINE__, ldaplist_modified); - osync_trace(TRACE_INTERNAL, "%s:%i: deleted_uids = %p", __FILE__, __LINE__, deleted_uids); - osync_trace(TRACE_INTERNAL, "%s:%i: unmodified_uids = %p", __FILE__, __LINE__, unmodified_uids); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, (void *)ldaplist_added); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_modified = %p", __FILE__, __LINE__, (void *)ldaplist_modified); + osync_trace(TRACE_INTERNAL, "%s:%i: deleted_uids = %p", __FILE__, __LINE__, (void *)deleted_uids); + osync_trace(TRACE_INTERNAL, "%s:%i: unmodified_uids = %p", __FILE__, __LINE__, (void *)unmodified_uids); @@ -2598,7 +2602,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, change, sinkenv, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)change, (void *)sinkenv, (void *)ldap_entries, (void *)error); if (!change) { @@ -2775,7 +2779,7 @@ uid = NULL; } - osync_trace(TRACE_EXIT, "%s(): *ldap_entries = %p", __func__, *ldap_entries); + osync_trace(TRACE_EXIT, "%s(): *ldap_entries = %p", __func__, (void *) *ldap_entries); return TRUE; @@ -2820,7 +2824,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, result, change, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)result, (void *)change, (void *)error); if (ctx == NULL) { @@ -2918,7 +2922,7 @@ osync_bool rv = TRUE; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, debug_id, hash, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)debug_id, (void *)hash, (void *)error); if (debug_id == NULL) { @@ -3026,7 +3030,7 @@ unsigned int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, ctx, sinkenv, change, ldap_entries, result, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)change, (void *)ldap_entries, (void *)result, (void *)error); if (sinkenv == NULL) { @@ -3109,7 +3113,7 @@ // from what has been stored as value for the key attribute. if (!ldap_plugin_check_for_keyattribute(sinkenv, entry, TRUE, error)) { if (!osync_error_is_set(error)) - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_check_for_keyattribute() has failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_check_for_keyattribute() has failed.", __FILE__... [truncated message content] |
|
From: <svn...@op...> - 2009-11-11 00:52:59
|
Author: cdfrey Date: Wed Nov 11 01:16:57 2009 New Revision: 5960 URL: http://www.opensync.org/changeset/5960 Log: Fixed osync_trace format strings Modified: format-plugins/xmlformat/trunk/src/xmlformat.c format-plugins/xmlformat/trunk/src/xmlformat_merge.c Modified: format-plugins/xmlformat/trunk/src/xmlformat.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat.c Wed Nov 11 01:09:16 2009 (r5959) +++ format-plugins/xmlformat/trunk/src/xmlformat.c Wed Nov 11 01:16:57 2009 (r5960) @@ -301,7 +301,7 @@ const char *revision = NULL; time_t time; - osync_trace(TRACE_ENTRY, "%s(%p, %i)", __func__, data, size, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p)", __func__, data, size, attribute, error); fieldlist = osync_xmlformat_search_field((OSyncXMLFormat *)data, attribute, error, NULL); if (!fieldlist) @@ -322,7 +322,7 @@ //time_t time = vformat_time_to_unix(revision); time = osync_time_vtime2unix(revision, 0, error); - osync_trace(TRACE_EXIT, "%s: %i", __func__, time); + osync_trace(TRACE_EXIT, "%s: %li", __func__, time); return time; error: Modified: format-plugins/xmlformat/trunk/src/xmlformat_merge.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat_merge.c Wed Nov 11 01:09:16 2009 (r5959) +++ format-plugins/xmlformat/trunk/src/xmlformat_merge.c Wed Nov 11 01:16:57 2009 (r5960) @@ -32,7 +32,7 @@ int ret; const char *objtype; - osync_trace(TRACE_ENTRY, "%s(%p, %p:%u, %p, %p, %p, %p, %u, %p, %p)", __func__, buf, size, *size, entirebuf, entiresize, caps, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p:%u, %p, %u, %p, %p, %p)", __func__, buf, size, *size, entirebuf, entiresize, caps, userdata, error); osync_assert(osync_xmlformat_size() == *size); osync_assert(osync_xmlformat_size() == entiresize); |
|
From: <svn...@op...> - 2009-11-11 00:09:30
|
Author: cdfrey Date: Wed Nov 11 01:09:16 2009 New Revision: 5959 URL: http://www.opensync.org/changeset/5959 Log: Fixed more printf-style format strings Modified: format-plugins/vformat/src/vformat.c format-plugins/vformat/src/xmlformat-vcard.c format-plugins/vformat/src/xmlformat-vnote.c Modified: format-plugins/vformat/src/vformat.c ============================================================================== --- format-plugins/vformat/src/vformat.c Wed Nov 11 00:58:50 2009 (r5958) +++ format-plugins/vformat/src/vformat.c Wed Nov 11 01:09:16 2009 (r5959) @@ -873,7 +873,7 @@ /* \t is (incorrectly) used by kOrganizer, so handle it here */ case 't': str = g_string_append_c (str, '\t'); break; default: - osync_trace(TRACE_INTERNAL, "invalid escape, passing it through. escaped char was %s", *p); + osync_trace(TRACE_INTERNAL, "invalid escape, passing it through. escaped char was %c", *p); str = g_string_append_c (str, '\\'); str = g_string_append_unichar (str, g_utf8_get_char(p)); break; Modified: format-plugins/vformat/src/xmlformat-vcard.c ============================================================================== --- format-plugins/vformat/src/xmlformat-vcard.c Wed Nov 11 00:58:50 2009 (r5958) +++ format-plugins/vformat/src/xmlformat-vcard.c Wed Nov 11 01:09:16 2009 (r5959) @@ -977,7 +977,7 @@ osync_bool conv_vcard_to_xmlformat(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %i, %p, %s, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error); + osync_trace(TRACE_ENTRY, "%s(%s, %u, %p, %p, %p, %s, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); OSyncHookTables *hooks = init_vcard_to_xmlformat(); Modified: format-plugins/vformat/src/xmlformat-vnote.c ============================================================================== --- format-plugins/vformat/src/xmlformat-vnote.c Wed Nov 11 00:58:50 2009 (r5958) +++ format-plugins/vformat/src/xmlformat-vnote.c Wed Nov 11 01:09:16 2009 (r5959) @@ -48,7 +48,7 @@ osync_bool conv_vnote_to_xmlformat(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %s, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); OSyncHookTables *hooks = init_vnote_to_xmlformat(VFORMAT_NOTE); @@ -121,7 +121,7 @@ static osync_bool conv_xmlformat_to_vnotememo(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error, int target) { - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %s, %p, %i)", __func__, input, inpsize, output, outpsize, free_input, config, error, target); OSyncHookTables *hooks = init_xmlformat_to_vnote(); |
|
From: <svn...@op...> - 2009-11-10 23:59:04
|
Author: cdfrey Date: Wed Nov 11 00:58:50 2009 New Revision: 5958 URL: http://www.opensync.org/changeset/5958 Log: Fixed osync_trace format string Modified: plugins/file-sync/src/file.c Modified: plugins/file-sync/src/file.c ============================================================================== --- plugins/file-sync/src/file.c Wed Nov 11 00:50:54 2009 (r5957) +++ plugins/file-sync/src/file.c Wed Nov 11 00:58:50 2009 (r5958) @@ -158,7 +158,7 @@ lastmod = file->last_mod; - osync_trace(TRACE_EXIT, "%s: %i", __func__, lastmod); + osync_trace(TRACE_EXIT, "%s: %li", __func__, lastmod); return lastmod; } |
|
From: <svn...@op...> - 2009-11-10 23:51:11
|
Author: cdfrey Date: Wed Nov 11 00:50:54 2009 New Revision: 5957 URL: http://www.opensync.org/changeset/5957 Log: Fixed osync_trace format string Modified: plugins/evolution2/src/evolution2_capabilities.c Modified: plugins/evolution2/src/evolution2_capabilities.c ============================================================================== --- plugins/evolution2/src/evolution2_capabilities.c Wed Nov 11 00:20:20 2009 (r5956) +++ plugins/evolution2/src/evolution2_capabilities.c Wed Nov 11 00:50:54 2009 (r5957) @@ -27,7 +27,7 @@ osync_bool evo2_translate_capabilities(OSyncCapabilities *caps, GList *fields, const char *objtype, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %p)", __func__, caps, fields, objtype, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, caps, fields, objtype, error); osync_assert(caps); osync_assert(fields); osync_assert(objtype); |
Author: cdfrey Date: Wed Nov 11 00:20:20 2009 New Revision: 5956 URL: http://www.opensync.org/changeset/5956 Log: Fixed all format errors reported by new GCC_FORMAT_CHECK Modified: trunk/opensync/archive/opensync_archive.c trunk/opensync/client/opensync_client_proxy.c trunk/opensync/common/opensync_thread.c trunk/opensync/data/opensync_data.c trunk/opensync/engine/opensync_engine.c trunk/opensync/format/opensync_caps_converter.c trunk/opensync/format/opensync_time.c trunk/opensync/group/opensync_group.c trunk/opensync/group/opensync_member.c trunk/opensync/opensync.h trunk/opensync/plugin/opensync_plugin_config.c trunk/tests/mock-plugin/mock_format.c Modified: trunk/opensync/archive/opensync_archive.c ============================================================================== --- trunk/opensync/archive/opensync_archive.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/archive/opensync_archive.c Wed Nov 11 00:20:20 2009 (r5956) @@ -288,7 +288,7 @@ char *escaped_objtype = NULL; char *escaped_objengine = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %lli, %s, %s, %lli, %lli, %p, %s)", __func__, archive, id, uid, objtype, mappingid, memberid, __NULLSTR(objengine), error); + osync_trace(TRACE_ENTRY, "%s(%p, %lli, %s, %s, %lli, %lli, %p, %p)", __func__, archive, id, uid, objtype, mappingid, memberid, __NULLSTR(objengine), error); osync_assert(archive); osync_assert(uid); osync_assert(objtype); Modified: trunk/opensync/client/opensync_client_proxy.c ============================================================================== --- trunk/opensync/client/opensync_client_proxy.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/client/opensync_client_proxy.c Wed Nov 11 00:20:20 2009 (r5956) @@ -1296,7 +1296,7 @@ long long int memberid = 0; #endif - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %s, %s, %s, %p, %p)", __func__, proxy, callback, userdata, formatdir, plugindir, plugin, groupname, configdir, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %s, %s, %s, %s, %p, %p)", __func__, proxy, callback, userdata, formatdir, plugindir, plugin, groupname, configdir, config, error); osync_assert(proxy); @@ -1446,7 +1446,7 @@ callContext *ctx = NULL; OSyncMessage *message = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, proxy, callback, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, proxy, callback, userdata, error); ctx = osync_try_malloc0(sizeof(callContext), error); if (!ctx) Modified: trunk/opensync/common/opensync_thread.c ============================================================================== --- trunk/opensync/common/opensync_thread.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/common/opensync_thread.c Wed Nov 11 00:20:20 2009 (r5956) @@ -149,7 +149,7 @@ error_free_thread: osync_free(thread); error: - osync_trace(TRACE_EXIT_ERROR, "%s", __func__, osync_error_print(error)); + osync_trace(TRACE_EXIT_ERROR, "%s(%s)", __func__, osync_error_print(error)); return NULL; } Modified: trunk/opensync/data/opensync_data.c ============================================================================== --- trunk/opensync/data/opensync_data.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/data/opensync_data.c Wed Nov 11 00:20:20 2009 (r5956) @@ -246,7 +246,7 @@ return -1; } - osync_trace(TRACE_EXIT, "%s: %i", __func__, time); + osync_trace(TRACE_EXIT, "%s: %li", __func__, time); return time; } Modified: trunk/opensync/engine/opensync_engine.c ============================================================================== --- trunk/opensync/engine/opensync_engine.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/engine/opensync_engine.c Wed Nov 11 00:20:20 2009 (r5956) @@ -955,7 +955,7 @@ osync_bool osync_engine_check_get_changes(OSyncEngine *engine) { if (osync_bitcount(engine->proxy_errors | engine->proxy_get_changes) != osync_list_length(engine->proxies)) { - osync_trace(TRACE_INTERNAL, "Not yet. main sinks still need to read: %i", osync_bitcount(engine->proxy_errors | engine->proxy_get_changes), osync_list_length(engine->proxies)); + osync_trace(TRACE_INTERNAL, "Not yet. main sinks still need to read: %i (%u)", osync_bitcount(engine->proxy_errors | engine->proxy_get_changes), osync_list_length(engine->proxies)); return FALSE; } Modified: trunk/opensync/format/opensync_caps_converter.c ============================================================================== --- trunk/opensync/format/opensync_caps_converter.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/format/opensync_caps_converter.c Wed Nov 11 00:20:20 2009 (r5956) @@ -36,7 +36,7 @@ OSyncCapsConverter *osync_caps_converter_new(const char *sourceformat, const char *targetformat, OSyncCapsConvertFunc convert_func, OSyncError **error) { OSyncCapsConverter *converter = NULL; - osync_trace(TRACE_ENTRY, "%s(%s, %s, %p, %p)", __func__, __NULLSTR(sourceformat), sourceformat, __NULLSTR(targetformat), targetformat, convert_func, error); + osync_trace(TRACE_ENTRY, "%s(%s, %p, %s, %p, %p, %p)", __func__, __NULLSTR(sourceformat), sourceformat, __NULLSTR(targetformat), targetformat, convert_func, error); converter = osync_try_malloc0(sizeof(OSyncCapsConverter), error); if (!converter) { Modified: trunk/opensync/format/opensync_time.c ============================================================================== --- trunk/opensync/format/opensync_time.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/format/opensync_time.c Wed Nov 11 00:20:20 2009 (r5956) @@ -479,7 +479,7 @@ zonediff += daydiff; } - osync_trace(TRACE_EXIT, "%s: %i", __func__, zonediff); + osync_trace(TRACE_EXIT, "%s: %li", __func__, zonediff); return zonediff; error: osync_trace(TRACE_EXIT, "%s", __func__); Modified: trunk/opensync/group/opensync_group.c ============================================================================== --- trunk/opensync/group/opensync_group.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/group/opensync_group.c Wed Nov 11 00:20:20 2009 (r5956) @@ -966,7 +966,7 @@ void osync_group_set_last_synchronization(OSyncGroup *group, time_t last_sync) { - osync_trace(TRACE_ENTRY, "%s(%p, %i)", __func__, group, last_sync); + osync_trace(TRACE_ENTRY, "%s(%p, %li)", __func__, group, last_sync); osync_assert(group); group->last_sync = last_sync; Modified: trunk/opensync/group/opensync_member.c ============================================================================== --- trunk/opensync/group/opensync_member.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/group/opensync_member.c Wed Nov 11 00:20:20 2009 (r5956) @@ -540,7 +540,7 @@ * member_configdir_deep_path */ if (g_mkdir_with_parents(member->configdir, 0700)) { - osync_error_set(error, OSYNC_ERROR_IO_ERROR, "Unable to create directory for member %li\n", member->id); + osync_error_set(error, OSYNC_ERROR_IO_ERROR, "Unable to create directory for member %lli\n", member->id); goto error; } } Modified: trunk/opensync/opensync.h ============================================================================== --- trunk/opensync/opensync.h Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/opensync.h Wed Nov 11 00:20:20 2009 (r5956) @@ -130,13 +130,13 @@ #define osync_return_if_fail_and_set_error(condition, error, errortype, format, ...) do { \ if (!(condition)) { \ - osync_error_set(error, errortype, format,## __VA_ARGS__, NULL ); \ + osync_error_set(error, errortype, format,## __VA_ARGS__); \ return; \ } } while(0) #define osync_return_val_if_fail_and_set_error(condition, val, error, errortype, format, ...) do { \ if (!(condition)) { \ - osync_error_set(error, errortype, format,## __VA_ARGS__, NULL ); \ + osync_error_set(error, errortype, format,## __VA_ARGS__); \ return (val); \ } } while(0) Modified: trunk/opensync/plugin/opensync_plugin_config.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_config.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/plugin/opensync_plugin_config.c Wed Nov 11 00:20:20 2009 (r5956) @@ -797,7 +797,7 @@ char *schemafile = NULL; const char *schemapath = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %s, %s, %p)", __func__, config, __NULLSTR(path), error); + osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, config, __NULLSTR(path), path, error); schemapath = config->schemadir ? config->schemadir : OPENSYNC_SCHEMASDIR; Modified: trunk/tests/mock-plugin/mock_format.c ============================================================================== --- trunk/tests/mock-plugin/mock_format.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/tests/mock-plugin/mock_format.c Wed Nov 11 00:20:20 2009 (r5956) @@ -194,7 +194,7 @@ OSyncFileFormat *file = (OSyncFileFormat *)input; time_t lastmod = file->last_mod; - osync_trace(TRACE_EXIT, "%s: %i", __func__, lastmod); + osync_trace(TRACE_EXIT, "%s: %li", __func__, lastmod); return lastmod; } |
|
From: <svn...@op...> - 2009-11-10 23:18:54
|
Author: cdfrey Date: Wed Nov 11 00:18:28 2009 New Revision: 5955 URL: http://www.opensync.org/changeset/5955 Log: Added GCC printf format string / arg checking to printf-like functions Modified: trunk/opensync/common/opensync_error.h trunk/opensync/common/opensync_string.h trunk/opensync/debug/opensync_trace.h trunk/opensync/opensync.h trunk/opensync/plugin/opensync_context.h Modified: trunk/opensync/common/opensync_error.h ============================================================================== --- trunk/opensync/common/opensync_error.h Tue Nov 10 17:55:01 2009 (r5954) +++ trunk/opensync/common/opensync_error.h Wed Nov 11 00:18:28 2009 (r5955) @@ -89,7 +89,7 @@ * @param format The message * */ -OSYNC_EXPORT void osync_error_set(OSyncError **error, OSyncErrorType type, const char *format, ...); +OSYNC_EXPORT void osync_error_set(OSyncError **error, OSyncErrorType type, const char *format, ...) GCC_FORMAT_CHECK(3, 4); /** @brief This will return a string describing the type of the error * Modified: trunk/opensync/common/opensync_string.h ============================================================================== --- trunk/opensync/common/opensync_string.h Tue Nov 10 17:55:01 2009 (r5954) +++ trunk/opensync/common/opensync_string.h Wed Nov 11 00:18:28 2009 (r5955) @@ -58,7 +58,7 @@ * @returns The duplicate string, caller is responsible for freeing. * */ -OSYNC_EXPORT char *osync_strdup_printf(const char *format, ...); +OSYNC_EXPORT char *osync_strdup_printf(const char *format, ...) GCC_FORMAT_CHECK(1, 2); /** @brief Creates a random string * Modified: trunk/opensync/debug/opensync_trace.h ============================================================================== --- trunk/opensync/debug/opensync_trace.h Tue Nov 10 17:55:01 2009 (r5954) +++ trunk/opensync/debug/opensync_trace.h Wed Nov 11 00:18:28 2009 (r5955) @@ -67,7 +67,7 @@ * @param message The message to save * */ -OSYNC_EXPORT void osync_trace(OSyncTraceType type, const char *message, ...); +OSYNC_EXPORT void osync_trace(OSyncTraceType type, const char *message, ...) GCC_FORMAT_CHECK(2, 3); /*! @brief Disable tracing * Modified: trunk/opensync/opensync.h ============================================================================== --- trunk/opensync/opensync.h Tue Nov 10 17:55:01 2009 (r5954) +++ trunk/opensync/opensync.h Wed Nov 11 00:18:28 2009 (r5955) @@ -67,6 +67,12 @@ #define OSYNC_TEST_EXPORT #endif +#if __GNUC__ +#define GCC_FORMAT_CHECK(a,b) __attribute__ ((format(printf, a, b))) +#else +#define GCC_FORMAT_CHECK(a,b) +#endif + OPENSYNC_BEGIN_DECLS /** Modified: trunk/opensync/plugin/opensync_context.h ============================================================================== --- trunk/opensync/plugin/opensync_context.h Tue Nov 10 17:55:01 2009 (r5954) +++ trunk/opensync/plugin/opensync_context.h Wed Nov 11 00:18:28 2009 (r5955) @@ -44,7 +44,7 @@ OSYNC_EXPORT void osync_context_set_slowsync_callback(OSyncContext *context, OSyncContextSlowSyncFn slowsync_func, void *userdata); OSYNC_EXPORT void osync_context_set_warning_callback(OSyncContext *context, OSyncContextCallbackFn warning); -OSYNC_EXPORT void osync_context_report_error(OSyncContext *context, OSyncErrorType type, const char *format, ...); +OSYNC_EXPORT void osync_context_report_error(OSyncContext *context, OSyncErrorType type, const char *format, ...) GCC_FORMAT_CHECK(3, 4); OSYNC_EXPORT void osync_context_report_success(OSyncContext *context); OSYNC_EXPORT void osync_context_report_osyncerror(OSyncContext *context, OSyncError *error); |
|
From: <svn...@op...> - 2009-11-10 16:55:14
|
Author: bellmich Date: Tue Nov 10 17:55:01 2009 New Revision: 5954 URL: http://www.opensync.org/changeset/5954 Log: fixed DS server behaviour on changes - the change and change status callback must be configured in the data store - the data store configuration must be completed before the data store session is created and used - if the plugin is not ready to handle changes then the function should block until the according context is available Modified: plugins/syncml/trunk/src/syncml_callbacks.c plugins/syncml/trunk/src/syncml_common.c plugins/syncml/trunk/src/syncml_common.h plugins/syncml/trunk/src/syncml_ds_server.c Modified: plugins/syncml/trunk/src/syncml_callbacks.c ============================================================================== --- plugins/syncml/trunk/src/syncml_callbacks.c Tue Nov 10 17:41:31 2009 (r5953) +++ plugins/syncml/trunk/src/syncml_callbacks.c Tue Nov 10 17:55:01 2009 (r5954) @@ -348,7 +348,13 @@ if (!database) goto error; - g_assert(database->getChangesCtx); + if (!database->getChangesCtx) + { + /* This should only happen for DS servers. */ + g_assert(database->getChangesMutex); + g_mutex_trylock(database->getChangesMutex); + g_mutex_unlock(database->getChangesMutex); + } change = osync_change_new(&oerror); if (!change) { Modified: plugins/syncml/trunk/src/syncml_common.c ============================================================================== --- plugins/syncml/trunk/src/syncml_common.c Tue Nov 10 17:41:31 2009 (r5953) +++ plugins/syncml/trunk/src/syncml_common.c Tue Nov 10 17:55:01 2009 (r5954) @@ -52,6 +52,12 @@ database->alert_type_cond = NULL; } + if (database->getChangesMutex) { + g_mutex_free(database->getChangesMutex); + database->getChangesMutex = NULL; + } + + if (database->sink) { osync_objtype_sink_unref(database->sink); database->sink = NULL; Modified: plugins/syncml/trunk/src/syncml_common.h ============================================================================== --- plugins/syncml/trunk/src/syncml_common.h Tue Nov 10 17:41:31 2009 (r5953) +++ plugins/syncml/trunk/src/syncml_common.h Tue Nov 10 17:55:01 2009 (r5954) @@ -128,6 +128,7 @@ OSyncContext *connectCtx; OSyncContext *syncModeCtx; OSyncContext *getChangesCtx; + GMutex *getChangesMutex; OSyncContext *commitCtx; GHashTable *uid_updates; Modified: plugins/syncml/trunk/src/syncml_ds_server.c ============================================================================== --- plugins/syncml/trunk/src/syncml_ds_server.c Tue Nov 10 17:41:31 2009 (r5953) +++ plugins/syncml/trunk/src/syncml_ds_server.c Tue Nov 10 17:55:01 2009 (r5954) @@ -84,9 +84,13 @@ sml_data_sync_data_store_register_get_alert_type_callback(data_store, _get_alert_type, env); sml_data_sync_data_store_register_get_anchor_callback(data_store, _get_anchor, env); sml_data_sync_data_store_register_set_anchor_callback(data_store, _set_anchor, env); + sml_data_sync_data_store_register_change_callback(data_store, _recv_change, env); + sml_data_sync_data_store_register_change_status_callback(data_store, _recv_change_status, env); if (!sml_data_sync_add_data_store(env->dsObject1, data_store, &error)) goto error; database->data_store_1 = data_store; + + database->getChangesMutex = g_mutex_new(); } osync_list_free(list); @@ -117,9 +121,6 @@ database->getChangesCtx = ctx; osync_context_ref(database->getChangesCtx); - sml_data_sync_data_store_register_change_callback(database->data_store_1, _recv_change, env); - sml_data_sync_data_store_register_change_status_callback(database->data_store_1, _recv_change_status, env); - osync_trace(TRACE_EXIT, "%s", __func__); return; } |
|
From: <svn...@op...> - 2009-11-10 16:41:44
|
Author: bellmich Date: Tue Nov 10 17:41:31 2009 New Revision: 5953 URL: http://www.opensync.org/changeset/5953 Log: the source directory must not contain any generated data Modified: plugins/syncml/trunk/CMakeLists.txt Modified: plugins/syncml/trunk/CMakeLists.txt ============================================================================== --- plugins/syncml/trunk/CMakeLists.txt Mon Nov 9 17:33:17 2009 (r5952) +++ plugins/syncml/trunk/CMakeLists.txt Tue Nov 10 17:41:31 2009 (r5953) @@ -25,7 +25,7 @@ SET( ENABLE_OBEX TRUE CACHE BOOL "OBEX Transport" ) SET( ENABLE_HTTP TRUE CACHE BOOL "HTTP Transport" ) -CONFIGURE_FILE("config.h.cmake" "config.h") +CONFIGURE_FILE("config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h") # add uninstall target CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) |
|
From: <svn...@op...> - 2009-11-10 16:39:51
|
Author: bellmich Date: Tue Nov 10 17:39:33 2009 New Revision: 1355 URL: http://libsyncml.opensync.org/changeset/1355 Log: track removed characters during normalization Modified: trunk/libsyncml/data_sync_api/sml_data_sync_change_item.c Modified: trunk/libsyncml/data_sync_api/sml_data_sync_change_item.c ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync_change_item.c Tue Nov 10 17:39:06 2009 (r1354) +++ trunk/libsyncml/data_sync_api/sml_data_sync_change_item.c Tue Nov 10 17:39:33 2009 (r1355) @@ -44,6 +44,7 @@ SmlLocation* loc; gchar* data; guint64 planned_size; + guint64 removed_chars; gchar* content_type; gboolean missing_data; SmlDataSyncDataStoreSession* data_store; @@ -139,6 +140,7 @@ self->priv->loc = NULL; self->priv->data = NULL; self->priv->planned_size = 0; + self->priv->removed_chars = 0; self->priv->content_type = NULL; self->priv->data_store = NULL; self->priv->userdata = NULL; @@ -363,6 +365,7 @@ gchar *help = g_strjoin(NULL, self->priv->data, self->priv->data + i + 1, NULL); g_free(self->priv->data); self->priv->data = help; + self->priv->removed_chars++; } else { /* \r => \n */ self->priv->data[i] = '\n'; @@ -448,7 +451,7 @@ sml_data_sync_change_item_get_planned_size (SmlDataSyncChangeItem *self) { g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), 0); - return self->priv->planned_size; + return self->priv->planned_size - self->priv->removed_chars; } /** @@ -708,8 +711,10 @@ g_free(self->priv->data); self->priv->data = complete; + self->priv->removed_chars += frag->priv->removed_chars; - if (self->priv->planned_size && self->priv->planned_size == strlen(self->priv->data)) + if (self->priv->planned_size && + self->priv->planned_size - self->priv->removed_chars == strlen(self->priv->data)) self->priv->missing_data = FALSE; return TRUE; |
|
From: <svn...@op...> - 2009-11-10 16:39:27
|
Author: bellmich Date: Tue Nov 10 17:39:06 2009 New Revision: 1354 URL: http://libsyncml.opensync.org/changeset/1354 Log: better error message Modified: trunk/libsyncml/sml_session.c Modified: trunk/libsyncml/sml_session.c ============================================================================== --- trunk/libsyncml/sml_session.c Tue Nov 10 12:42:06 2009 (r1353) +++ trunk/libsyncml/sml_session.c Tue Nov 10 17:39:06 2009 (r1354) @@ -1403,7 +1403,9 @@ goto error; smlStatusUnref(reply); g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, - "Chunked item size mismatch"); + "The size of the chunked item is %d. The expected size is %d.", + strlen(sml_data_sync_change_item_get_data(lastItem)), + sml_data_sync_change_item_get_planned_size(lastItem)); goto error; } |
|
From: <svn...@op...> - 2009-11-10 11:42:23
|
Author: bellmich Date: Tue Nov 10 12:42:06 2009 New Revision: 1353 URL: http://libsyncml.opensync.org/changeset/1353 Log: const pointers must not be freed Modified: trunk/libsyncml/data_sync_api/data_sync_devinf.c trunk/libsyncml/sml_manager.c Modified: trunk/libsyncml/data_sync_api/data_sync_devinf.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_devinf.c Mon Nov 9 17:10:34 2009 (r1352) +++ trunk/libsyncml/data_sync_api/data_sync_devinf.c Tue Nov 10 12:42:06 2009 (r1353) @@ -747,7 +747,6 @@ self->priv->local = sml_location_new(); const gchar *ident = sml_data_sync_dev_inf_get_identifier(); sml_location_set_uri(self->priv->local, ident); - smlSafeCFree(&ident); } if (self->priv->fake_device) Modified: trunk/libsyncml/sml_manager.c ============================================================================== --- trunk/libsyncml/sml_manager.c Mon Nov 9 17:10:34 2009 (r1352) +++ trunk/libsyncml/sml_manager.c Tue Nov 10 12:42:06 2009 (r1353) @@ -352,8 +352,11 @@ goto error; smlHeaderFree(header); - if (cred) + header = NULL; + if (cred) { smlCredUnref(cred); + cred = NULL; + } /* Now let the session handle the commands etc */ if (!smlSessionReceiveBody(session, parser, &locerror)) @@ -361,6 +364,7 @@ /* Free the parser */ smlParserFree(parser); + parser = NULL; /* make the session accessible for others */ smlSessionUnlock(session); |
