Changeset 3123d2a in mainline for uspace/srv/hid/remcons

Timestamp:

2012-06-01T19:26:32Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

520acaf, 85a4350, c573e0f, e1e4192

Parents:

2f90b46

Message:

trivial changes (error code reporting, messages)

Location:

uspace/srv/hid/remcons

Files:

• remcons.c (modified) (5 diffs)
• telnet.h (modified) (1 diff)
• user.h (modified) (1 diff)

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);

uspace/srv/hid/remcons/telnet.h

@@ -57 +57 @@
 #define TELNET_LINEMODE 34
 
-
 #endif
 

uspace/srv/hid/remcons/user.h

@@ -76 +76 @@
 } telnet_user_t;
 
-telnet_user_t *telnet_user_create(int socket);
-void telnet_user_destroy(telnet_user_t *user);
-telnet_user_t *telnet_user_get_for_client_connection(service_id_t id);
-bool telnet_user_is_zombie(telnet_user_t *user);
-void telnet_user_notify_client_disconnected(telnet_user_t *user);
-int telnet_user_get_next_keyboard_event(telnet_user_t *user, kbd_event_t *event);
-int telnet_user_send_data(telnet_user_t *user, uint8_t *data, size_t size);
-void telnet_user_update_cursor_x(telnet_user_t *user, int new_x);
+extern telnet_user_t *telnet_user_create(int);
+extern void telnet_user_destroy(telnet_user_t *);
+extern telnet_user_t *telnet_user_get_for_client_connection(service_id_t);
+extern bool telnet_user_is_zombie(telnet_user_t *);
+extern void telnet_user_notify_client_disconnected(telnet_user_t *);
+extern int telnet_user_get_next_keyboard_event(telnet_user_t *, kbd_event_t *);
+extern int telnet_user_send_data(telnet_user_t *, uint8_t *, size_t);
+extern void telnet_user_update_cursor_x(telnet_user_t *, int);
 
 /** Print informational message about connected user. */
 #ifdef CONFIG_DEBUG
 #define telnet_user_log(user, fmt, ...) \
-        printf(NAME " [console %d (%d)]: " fmt "\n", user->id, (int) user->service_id, ##__VA_ARGS__)
+        printf(NAME " [console %d (%d)]: " fmt "\n", \
+            user->id, (int) user->service_id, ##__VA_ARGS__)
 #else
-#define telnet_user_log(user, fmt, ...) (void)0
+#define telnet_user_log(user, fmt, ...) ((void) 0)
 #endif
 
 /** Print error message associated with connected user. */
 #define telnet_user_error(user, fmt, ...) \
-        fprintf(stderr, NAME " [console %d (%d)]: ERROR: " fmt "\n", user->id, (int) user->service_id, ##__VA_ARGS__)
+        fprintf(stderr, NAME " [console %d (%d)]: ERROR: " fmt "\n", \
+            user->id, (int) user->service_id, ##__VA_ARGS__)
 
 #endif