Changeset 5251:9002ab4e6a86 in roaraudio

Timestamp:

11/13/11 15:30:25 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improved roar_err_store() and roar_err_restore()

Files:

• include/libroar/error.h (modified) (1 diff)
• libroar/error.c (modified) (2 diffs)

include/libroar/error.h

@@ -67 +67 @@
 struct roar_error_state {
  size_t refc;
- int libroar_error;
- int system_errno;
+ int libroar_error; // roar_error
+ int system_error; // errno
+#ifdef ROAR_TARGET_WIN32
+ int winsock_error; // WSAGetLastError(), WSASetLastError()
+#else
+ int syssock_herror; // h_errno
+#endif
+#ifdef __YIFF__
+ yiffc_error_t yiffc_error; // yiffc_error
+#endif
 };
 

libroar/error.c

@@ -881 +881 @@
  state->refc          = 0;
  state->libroar_error = roar_error;
- state->system_errno  = errno;
+ state->system_error  = errno;
+
+#ifdef ROAR_TARGET_WIN32
+ state->winsock_error = WSAGetLastError();
+#else
+ state->syssock_herror = h_errno;
+#endif
+
+#ifdef __YIFF__
+ state->yiffc_error = yiffc_error;
+#endif
 
  return ROAR_ERROR_NONE;
@@ -892 +902 @@
 
  roar_err_set(state->libroar_error);
- errno = state->system_errno;
+ errno = state->system_error;
+
+#ifdef ROAR_TARGET_WIN32
+ WSASetLastError(state->winsock_error);
+#else
+ h_errno = state->syssock_herror;
+#endif
+
+#ifdef __YIFF__
+ yiffc_error = state->yiffc_error;
+#endif
 
  return ROAR_ERROR_NONE;