Changeset 5816:6c593d184ef2 in roaraudio for libroar

Timestamp:

01/05/13 14:31:33 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improved service interface even more, allow creation of a simple interface object to access functions.

File:

• libroar/roardl.c (modified) (2 diffs)

libroar/roardl.c

@@ -1028 +1028 @@
 }
 
-const void * libroar_dl_service_get_api(struct roar_dl_librarypara * para, const char * appname, const char * appabi, const char * servicename, const char * serviceabi, int universal, struct roar_dl_lhandle ** lhandle) {
+int libroar_dl_service_get_api_real(struct roar_dl_librarypara * para, const char * appname, const char * appabi, const char * servicename, const char * serviceabi, int universal, struct roar_dl_service_api * api) {
  const struct roar_dl_service * s;
  struct __fnregs * c = NULL;
  size_t i;
+ int err;
+
+ if ( para == NULL || servicename == NULL || serviceabi == NULL || api == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ memset(api, 0, sizeof(struct roar_dl_service_api));
 
  for (i = 0; i < __MAX_FNREGS; i++) {
@@ -1062 +1070 @@
    continue;
 
-  if ( lhandle != NULL ) {
-   if ( roar_dl_ref(c->lhandle) != 0 )
-    continue;
-   *lhandle = c->lhandle;
-  }
-
-  return s->get_api(s, para);
+  if ( roar_dl_ref(c->lhandle) != 0 )
+   continue;
+
+  api->lhandle = c->lhandle;
+
+  api->api = s->get_api(s, para);
+  if ( api->api == NULL ) {
+   err = roar_error;
+   roar_dl_unref(c->lhandle);
+   api->lhandle = NULL;
+   roar_error = err;
+   return -1;
+  }
+
+  return 0;
  }
 
  roar_err_set(ROAR_ERROR_NOENT);
- return NULL;
+ return -1;
+}
+
+int libroar_dl_service_free_api_real(struct roar_dl_service_api * api) {
+ if ( api == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ roar_dl_unref(api->lhandle);
+
+ memset(api, 0, sizeof(struct roar_dl_service_api));
+
+ return 0;
 }