Changeset 8b36bf2 in mainline for uspace/app/loc/loc.c

Timestamp:

2012-06-20T23:03:29Z (11 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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.

Message:

Merge mainline changes

File:

• uspace/app/loc/loc.c (modified) (2 diffs)

uspace/app/loc/loc.c

@@ -48 +48 @@
         size_t svc_cnt;
         char *svc_name;
+        char *server_name;
         int rc;
         size_t j;
 
-        printf("%s (%" PRIun "):\n", cat_name, cat_id);
+        printf("%s:\n", cat_name);
 
         rc = loc_category_get_svcs(cat_id, &svc_ids, &svc_cnt);
@@ -67 +68 @@
                         continue;
                 }
-                printf("\t%s (%" PRIun ")\n", svc_name, svc_ids[j]);
+
+                rc = loc_service_get_server_name(svc_ids[j], &server_name);
+                if (rc != EOK && rc != EINVAL) {
+                        free(svc_name);
+                        printf(NAME ": Unknown service name (SID %"
+                            PRIun ").\n", svc_ids[j]);
+                        continue;
+                }
+
+                if (rc == EOK)
+                        printf("\t%s : %s\n", svc_name, server_name);
+                else
+                        printf("\t%s\n", svc_name);
+        
                 free(svc_name);
+                free(server_name);
         }