Changeset e28175d in mainline for uspace/lib/c/generic/loc.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• uspace/lib/c/generic/loc.c (modified) (5 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;