Changeset e8975278 in mainline for uspace/srv

Timestamp:

2018-05-10T15:14:02Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1420cae9

Parents:

ae7d03c

git-author:

Jiri Svoboda <jiri@…> (2018-05-10 07:53:56)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-10 15:14:02)

Message:

A few more cstyle fixes.

Location:

uspace/srv

Files:

• fs/exfat/exfat_directory.c (modified) (1 diff)
• fs/exfat/exfat_ops.c (modified) (3 diffs)
• hid/isdv4_tablet/isdv4.c (modified) (1 diff)
• net/tcp/conn.c (modified) (1 diff)

uspace/srv/fs/exfat/exfat_directory.c

@@ -71 +71 @@
 
         di->bs = block_bb_get(di->service_id);
-/*      di->blocks = nodep->size / BPS(di->bs); */
         di->blocks = ROUND_UP(nodep->size, BPS(di->bs)) / BPS(di->bs);
         return EOK;

uspace/srv/fs/exfat/exfat_ops.c

@@ -1198 +1198 @@
         }
 
-        /* exfat_fsinfo(bs, service_id); */
+        if (0)
+                exfat_fsinfo(bs, service_id);
 
         *rrfn = FS_NODE(rootp);
@@ -1237 +1238 @@
 
 /* Print debug info */
-/*
 static void exfat_fsinfo(exfat_bs_t *bs, service_id_t service_id)
 {
@@ -1252 +1252 @@
         printf("Bytes per sector: %d\n", BPS(bs));
         printf("Sectors per cluster: %d\n", SPC(bs));
-        printf("KBytes per cluster: %d\n", SPC(bs)*BPS(bs)/1024);
+        printf("KBytes per cluster: %d\n", SPC(bs) * BPS(bs) / 1024);
 
         int i, rc;
         exfat_cluster_t clst;
-        for (i=0; i<=7; i++) {
+        for (i = 0; i <= 7; i++) {
                 rc = exfat_get_cluster(bs, service_id, i, &clst);
                 if (rc != EOK)
                         return;
                 printf("Clst %d: %x", i, clst);
-                if (i>=2)
-                        printf(", Bitmap: %d\n", bitmap_is_free(bs, service_id, i)!=EOK);
+                if (i >= 2)
+                        printf(", Bitmap: %d\n", bitmap_is_free(bs, service_id, i) != EOK);
                 else
                         printf("\n");
         }
 }
-*/
 
 static errno_t exfat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)

uspace/srv/hid/isdv4_tablet/isdv4.c

@@ -54 +54 @@
 #define CMD_QUERY_TOUCH '%'
 
-/* packet_consumer_fn(uint8_t *packet, size_t size, isdv4_state_t *state,
-   void *data)
-   return true if reading of packets should continue */
-typedef bool (*packet_consumer_fn)(uint8_t *, size_t, isdv4_state_t *);
+/** Packet consumer function
+ *
+ * @return true if reading of packets should continue
+ */
+typedef bool (*packet_consumer_fn)(uint8_t *packet, size_t size,
+    isdv4_state_t *state);
 
 static void isdv4_event_init(isdv4_event_t *event)

uspace/srv/net/tcp/conn.c

@@ -1186 +1186 @@
         tcp_segment_dump(seg);
 
-        /* Check whether segment is acceptable */
-        /* XXX Permit valid ACKs, URGs and RSTs */
-/*      if (!seq_no_segment_acceptable(conn, seg)) {
-                log_msg(LOG_DEFAULT, LVL_WARN, "Segment not acceptable, dropping.");
-                if ((seg->ctrl & CTL_RST) == 0) {
-                        tcp_tqueue_ctrl_seg(conn, CTL_ACK);
-                }
-                return;
-        }
-*/
-
         if (tcp_conn_seg_proc_rst(conn, seg) == cp_done)
                 return;