Changeset e8975278 in mainline for uspace/lib

Timestamp:

2018-05-10T15:14:02Z (8 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/lib

Files:

• c/arch/ia32/src/rtld/reloc.c (modified) (1 diff)
• c/arch/ia32/src/tls.c (modified) (1 diff)
• posix/src/stdio/scanf.c (modified) (4 diffs)
• trackmod/trackmod.c (modified) (2 diffs)
• trackmod/types/trackmod.h (modified) (1 diff)

uspace/lib/c/arch/ia32/src/rtld/reloc.c

@@ -93 +93 @@
                 sym = &sym_table[sym_idx];
 
-/*              DPRINTF("name '%s', value 0x%x, size 0x%x\n",
-                    str_tab + sym->st_name,
-                    sym->st_value,
-                    sym->st_size);
-*/
+#if 0
+                DPRINTF("name '%s', value 0x%x, size 0x%x\n",
+                    str_tab + sym->st_name, sym->st_value, sym->st_size);
+#endif
                 rel_type = ELF32_R_TYPE(r_info);
                 r_ptr = (uint32_t *)(r_offset + m->bias);

uspace/lib/c/arch/ia32/src/tls.c

@@ -33 +33 @@
  */
 /** @file
-  * @ingroup libcia32
+ * @ingroup libcia32
  */
 

uspace/lib/posix/src/stdio/scanf.c

@@ -61 +61 @@
         _PROV_READY,
         /** Cursor is temporarily lent to the external entity. No action is
-          * possible until the cursor is returned.  */
+         * possible until the cursor is returned.  */
         _PROV_CURSOR_LENT,
 };
@@ -74 +74 @@
         int fetched;
         /** Elements are fetched from the source in batches (e.g. by getline())
-          * to allow using strtol/strtod family even on streams. */
+         * to allow using strtol/strtod family even on streams. */
         char *window;
         /** Size of the current window. */
@@ -84 +84 @@
 
         /** Take control over data source. Finish initialization of the internal
-          * structures (e.g. allocation of window). */
+         * structures (e.g. allocation of window). */
         void (*capture)(struct __input_provider *);
         /** Get a single element from the source and update the internal structures
-          * accordingly (e.g. greedy update of the window). Return -1 if the
-          * element cannot be obtained. */
+         * accordingly (e.g. greedy update of the window). Return -1 if the
+         * element cannot be obtained. */
         int (*pop)(struct __input_provider *);
         /** Undo the most recent not-undone pop operation. Might be necesarry to
-          * flush current window and seek data source backwards. Return 0 if the
-          * pop history is exhausted, non-zero on success. */
+         * flush current window and seek data source backwards. Return 0 if the
+         * pop history is exhausted, non-zero on success. */
         int (*undo)(struct __input_provider *);
         /** Lend the cursor to the caller.  */
         const char *(*borrow_cursor)(struct __input_provider *);
         /** Take control over possibly incremented cursor and update the internal
-          * structures if necessary. */
+         * structures if necessary. */
         void (*return_cursor)(struct __input_provider *, const char *);
         /** Release the control over the source. That is, synchronize any
-          * fetched but non-consumed elements (e.g. by seeking) and destruct
-          * internal structures (e.g. window deallocation). */
+         * fetched but non-consumed elements (e.g. by seeking) and destruct
+         * internal structures (e.g. window deallocation). */
         void (*release)(struct __input_provider *);
 } _input_provider;
@@ -411 +411 @@
                 *base = 10;
                 return 1;
-        case 'p': /* According to POSIX, %p modifier is implementation defined but
-                           * must correspond to its printf counterpart. */
+        case 'p':
+                /* According to POSIX, %p modifier is implementation defined but
+                 * must correspond to its printf counterpart. */
         case 'x':
         case 'X':

uspace/lib/trackmod/trackmod.c

@@ -62 +62 @@
 
 /** Table for finetune computation.
-  *
-  * Finetune is a number ft in [-8 .. 7]. The pitch should be adjusted by
-  * ft/8 semitones. To adjust pitch by 1/8 semitone down we can mutiply the
-  * period by 2^(1/12/8) =. 1.0072, one semitone up: 2^-(1/12/8) =. 0.9928,
-  * to adjust by ft/8 semitones, multiply by 2^(-ft/12/8).
-  *
-  * finetune_factor[ft] := 10000 * 2^(-ft/12/8)
-  * res_period = clip(period * fineture_factor[ft+8] / 10000)
-  */
+ *
+ * Finetune is a number ft in [-8 .. 7]. The pitch should be adjusted by
+ * ft/8 semitones. To adjust pitch by 1/8 semitone down we can mutiply the
+ * period by 2^(1/12/8) =. 1.0072, one semitone up: 2^-(1/12/8) =. 0.9928,
+ * to adjust by ft/8 semitones, multiply by 2^(-ft/12/8).
+ *
+ * finetune_factor[ft] := 10000 * 2^(-ft/12/8)
+ * res_period = clip(period * fineture_factor[ft+8] / 10000)
+ */
 static unsigned finetune_factor[16] = {
         10595, 10518, 10443, 10368, 10293, 10219, 10145, 10072,
@@ -731 +731 @@
                 }
 
-/*              if (np < period_min)
+#if 0
+                /* XXX */
+                if (np < period_min)
                         np = period_min;
                 if (np > period_max)
                         np = period_max;
-*/
+#endif
                 modplay->chan[i].period = np;
         }

uspace/lib/trackmod/types/trackmod.h

@@ -153 +153 @@
         int vol_slide;
         /** Portamento amount (positive for tone and up portamento,
-          * negative for down portamento. */
+         * negative for down portamento. */
         int portamento;
         /** Tone portamento target period. */