Changeset 8565a42 in mainline for uspace/app/ping

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• uspace/app/ping/ping.c (modified) (19 diffs)

uspace/app/ping/ping.c

@@ -115 +115 @@
         if (rc != EOK)
                 return ENOMEM;
-        
+
         char *adest;
         rc = inet_addr_format(&dest_addr, &adest);
@@ -122 +122 @@
                 return ENOMEM;
         }
-        
+
         printf("Received ICMP echo reply: from %s to %s, seq. no %u, "
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
-        
+
         ping_signal_received(RECEIVED_SUCCESS);
-        
+
         free(asrc);
         free(adest);
@@ -136 +136 @@
 {
         inetping_sdu_t sdu;
-        
+
         sdu.src = src_addr;
         sdu.dest = dest_addr;
@@ -142 +142 @@
         sdu.data = (void *) "foo";
         sdu.size = 3;
-        
+
         errno_t rc = inetping_send(&sdu);
         if (rc != EOK)
                 printf("Failed sending echo request: %s: %s.\n",
                     str_error_name(rc), str_error(rc));
-        
+
         return rc;
 }
@@ -154 +154 @@
 {
         uint16_t seq_no = 0;
-        
+
         while ((repeat_count--) || (repeat_forever)) {
                 fibril_mutex_lock(&received_lock);
                 received = RECEIVED_NONE;
                 fibril_mutex_unlock(&received_lock);
-                
+
                 (void) ping_send(++seq_no);
-                
+
                 fibril_mutex_lock(&received_lock);
                 errno_t rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
@@ -167 +167 @@
                 received_t recv = received;
                 fibril_mutex_unlock(&received_lock);
-                
+
                 if ((rc == ETIMEOUT) || (recv == RECEIVED_NONE))
                         printf("Echo request timed out (seq. no %u)\n", seq_no);
-                
+
                 if (recv == RECEIVED_INTERRUPT)
                         break;
-                
+
                 if ((repeat_count > 0) || (repeat_forever)) {
                         fibril_mutex_lock(&received_lock);
@@ -180 +180 @@
                         recv = received;
                         fibril_mutex_unlock(&received_lock);
-                        
+
                         if (recv == RECEIVED_INTERRUPT)
                                 break;
                 }
         }
-        
+
         ping_signal_quit();
         return 0;
@@ -193 +193 @@
 {
         console_ctrl_t *con = console_init(stdin, stdout);
-        
+
         while (true) {
                 cons_event_t ev;
                 if (!console_get_event(con, &ev))
                         break;
-                
+
                 if ((ev.type == CEV_KEY) && (ev.ev.key.type == KEY_PRESS) &&
                     ((ev.ev.key.mods & (KM_ALT | KM_SHIFT)) == 0) &&
@@ -209 +209 @@
                 }
         }
-        
+
         return 0;
 }
@@ -221 +221 @@
         const char *errmsg;
         ip_ver_t ip_ver = ip_any;
-        
+
         errno_t rc = inetping_init(&ev_ops);
         if (rc != EOK) {
@@ -228 +228 @@
                 goto error;
         }
-        
+
         int c;
         while ((c = getopt(argc, argv, short_options)) != -1) {
@@ -255 +255 @@
                 }
         }
-        
+
         if (optind >= argc) {
                 printf("IP address or host name not supplied.\n");
@@ -261 +261 @@
                 goto error;
         }
-        
+
         host = argv[optind];
-        
+
         /* Look up host */
         rc = inet_host_plookup_one(host, ip_ver, &dest_addr, NULL, &errmsg);
@@ -270 +270 @@
                 goto error;
         }
-        
+
         /* Determine source address */
         rc = inetping_get_srcaddr(&dest_addr, &src_addr);
@@ -277 +277 @@
                 goto error;
         }
-        
+
         rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
@@ -283 +283 @@
                 goto error;
         }
-        
+
         rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
@@ -289 +289 @@
                 goto error;
         }
-        
+
         if (asprintf(&sdest, "%s (%s)", host, adest) < 0) {
                 printf("Out of memory.\n");
                 goto error;
         }
-        
+
         printf("Sending ICMP echo request from %s to %s (Ctrl+Q to quit)\n",
             asrc, sdest);
-        
+
         fid_t fid = fibril_create(transmit_fibril, NULL);
         if (fid == 0) {
@@ -303 +303 @@
                 goto error;
         }
-        
+
         fibril_add_ready(fid);
-        
+
         fid = fibril_create(input_fibril, NULL);
         if (fid == 0) {
@@ -311 +311 @@
                 goto error;
         }
-        
+
         fibril_add_ready(fid);
-        
+
         fibril_mutex_lock(&quit_lock);
         while (!quit)
                 fibril_condvar_wait(&quit_cv, &quit_lock);
         fibril_mutex_unlock(&quit_lock);
-        
+
         free(asrc);
         free(adest);
         free(sdest);
         return 0;
-        
+
 error:
         free(asrc);