Changeset 1477

Timestamp:

11/24/06 19:47:10 (2 years ago)

Author:

dgollub

Message:

Fixed build for latest devel branch.

Location:

branches/palm-dev/src

Files:

• palm_format.c (modified) (1 diff)
• palm_sync.c (modified) (8 diffs)

branches/palm-dev/src/palm_format.c

@@ -22 +22 @@
 #include "palm_format.h"
 
-#include <opensync/opensync-xml.h>
+#include <opensync/opensync_xml.h>
 #include <opensync/opensync-time.h>
 #include <opensync/opensync-format.h>

branches/palm-dev/src/palm_sync.c

@@ -126 +126 @@
         int ret = dlp_OpenDB(env->socket, 0, dlpOpenReadWrite, name, &(db->handle));
         if (_psyncCheckReturn(env->socket, ret, error) != PSYNC_NO_ERROR) {
-                osync_error_update(error, "Unable to open %s: %s", name, osync_error_print(error));
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open %s: %s", name, osync_error_print(error));
                 goto error_free_db;
         }
@@ -187 +187 @@
         PSyncError err = _psyncCheckReturn(db->env->socket, ret, error);
         if (err == PSYNC_ERROR_OTHER) {
-                osync_error_update(error, "Unable to get next entry: %s", osync_error_print(error));
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to get next entry: %s", osync_error_print(error));
                 goto error_free_buffer;
         } else if (err == PSYNC_ERROR_NOT_FOUND) {
@@ -237 +237 @@
         PSyncError err = _psyncCheckReturn(db->env->socket, ret, error);
         if (err == PSYNC_ERROR_OTHER) {
-                osync_error_update(error, "Unable to get next entry: %s", osync_error_print(error));
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to get next entry: %s", osync_error_print(error));
                 goto error_free_buffer;
         } else if (err == PSYNC_ERROR_NOT_FOUND) {
@@ -288 +288 @@
         PSyncError err = _psyncCheckReturn(db->env->socket, ret, error);
         if (err == PSYNC_ERROR_OTHER) {
-                osync_error_update(error, "Unable to get next entry: %s", osync_error_print(error));
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to get next entry: %s", osync_error_print(error));
                 goto error_free_buffer;
         } else if (err == PSYNC_ERROR_NOT_FOUND) {
@@ -318 +318 @@
         int ret = dlp_DeleteRecord(db->env->socket, db->handle, 0,  id);
         if (_psyncCheckReturn(db->env->socket, ret, error) != PSYNC_NO_ERROR) {
-                osync_error_update(error, "Unable to delete file: %s", osync_error_print(error));
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to delete file: %s", osync_error_print(error));
                 goto error;
         }
@@ -344 +344 @@
 #endif
         if (_psyncCheckReturn(db->env->socket, ret, error) != PSYNC_NO_ERROR) {
-                osync_error_update(error, "Unable to write file: %s", osync_error_print(error));
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to write file: %s", osync_error_print(error));
                 goto error;
         }
@@ -377 +377 @@
 #endif
         if (_psyncCheckReturn(db->env->socket, ret, error) != PSYNC_NO_ERROR) {
-                osync_error_update(error, "Unable to add file: %s", osync_error_print(error));
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to add file: %s", osync_error_print(error));
                 goto error;
         }
@@ -677 +677 @@
         osync_trace(TRACE_INTERNAL, "test %i", ret);
         if (_psyncCheckReturn(env->socket, ret, &error) != PSYNC_NO_ERROR) {
-                osync_error_update(&error, "Unable to read UserInfo: %s", osync_error_print(&error));
+                //osync_error_update(&error, "Unable to read UserInfo: %s", osync_error_print(&error));
                 goto error;
         }