Changes in uspace/lib/c/generic/loc.c [fafb8e5:2a09dcb] in mainline

File:

• uspace/lib/c/generic/loc.c (modified) (6 diffs)

uspace/lib/c/generic/loc.c

@@ -153 +153 @@
                                 loc_supp_block_sess =
                                     service_connect_blocking(SERVICE_LOC,
-                                    INTERFACE_LOC_SUPPLIER, 0);
+                                    INTERFACE_LOC_SUPPLIER, 0, NULL);
                 }
 
@@ -172 +172 @@
                                 loc_cons_block_sess =
                                     service_connect_blocking(SERVICE_LOC,
-                                    INTERFACE_LOC_CONSUMER, 0);
+                                    INTERFACE_LOC_CONSUMER, 0, NULL);
                 }
 
@@ -202 +202 @@
                         loc_supplier_sess =
                             service_connect(SERVICE_LOC,
-                            INTERFACE_LOC_SUPPLIER, 0);
+                            INTERFACE_LOC_SUPPLIER, 0, NULL);
 
                 fibril_mutex_unlock(&loc_supplier_mutex);
@@ -216 +216 @@
                         loc_consumer_sess =
                             service_connect(SERVICE_LOC,
-                            INTERFACE_LOC_CONSUMER, 0);
+                            INTERFACE_LOC_CONSUMER, 0, NULL);
 
                 fibril_mutex_unlock(&loc_consumer_mutex);
@@ -567 +567 @@
 
         if (flags & IPC_FLAG_BLOCKING)
-                sess = service_connect_blocking(SERVICE_LOC, iface, handle);
+                sess = service_connect_blocking(SERVICE_LOC, iface, handle, NULL);
         else
-                sess = service_connect(SERVICE_LOC, iface, handle);
+                sess = service_connect(SERVICE_LOC, iface, handle, NULL);
 
         return sess;
@@ -819 +819 @@
 
                 alloc_size = act_size;
-                ids = realloc(ids, alloc_size);
-                if (ids == NULL)
+                service_id_t *tmp = realloc(ids, alloc_size);
+                if (tmp == NULL) {
+                        free(ids);
                         return ENOMEM;
+                }
+                ids = tmp;
         }