Changeset 520acaf in mainline for uspace/srv/hid/remcons/remcons.c

Timestamp:

2012-06-06T21:13:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5f679702

Parents:

11b9ad7 (diff), 3123d2a (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/srv/hid/remcons/remcons.c (modified) (5 diffs)

uspace/srv/hid/remcons/remcons.c

@@ -71 +71 @@
         TELNET_IAC, TELNET_WONT, TELNET_LINEMODE
 };
+
 static const size_t telnet_force_character_mode_command_count =
     sizeof(telnet_force_character_mode_command) / sizeof(telnet_cmd_t);
@@ -272 +273 @@
 static int network_user_fibril(void *arg)
 {
-        int rc;
         telnet_user_t *user = arg;
 
-        rc = loc_service_register(user->service_name, &user->service_id);
+        int rc = loc_service_register(user->service_name, &user->service_id);
         if (rc != EOK) {
                 telnet_user_error(user, "Unable to register %s with loc: %s.",
@@ -284 +284 @@
         telnet_user_log(user, "Service %s registerd with id %" PRIun ".",
             user->service_name, user->service_id);
-
+        
         fid_t spawn_fibril = fibril_create(spawn_task_fibril, user);
         assert(spawn_fibril);
         fibril_add_ready(spawn_fibril);
-
+        
         /* Wait for all clients to exit. */
         fibril_mutex_lock(&user->guard);
@@ -304 +304 @@
         }
         fibril_mutex_unlock(&user->guard);
-
+        
         rc = loc_service_unregister(user->service_id);
         if (rc != EOK) {
@@ -324 +324 @@
         async_set_client_connection(client_connection);
         int rc = loc_server_register(NAME);
-        if (rc < 0) {
-                fprintf(stderr, NAME ": Unable to register server: %s.\n",
-                    str_error(rc));
-                return 1;
-        }
-
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to register server\n", NAME);
+                return rc;
+        }
+        
         struct sockaddr_in addr;
-
+        
         addr.sin_family = AF_INET;
         addr.sin_port = htons(port);
-
+        
         rc = inet_pton(AF_INET, "127.0.0.1", (void *)
             &addr.sin_addr.s_addr);