Changeset a35b458 in mainline for uspace/lib/c/include/io

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

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

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

Location:

uspace/lib/c/include/io

Files:

• charfield.h (modified) (2 diffs)
• chargrid.h (modified) (1 diff)
• console.h (modified) (1 diff)
• kbd_event.h (modified) (1 diff)
• keycode.h (modified) (3 diffs)
• mode.h (modified) (1 diff)
• pixelmap.h (modified) (4 diffs)
• printf_core.h (modified) (1 diff)

uspace/lib/c/include/io/charfield.h

@@ -86 +86 @@
         if (a1.type != a2.type)
                 return false;
-        
+
         switch (a1.type) {
         case CHAR_ATTR_STYLE:
@@ -98 +98 @@
                     && (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor);
         }
-        
+
         return false;
 }

uspace/lib/c/include/io/chargrid.h

@@ -49 +49 @@
         size_t size;            /**< Structure size */
         chargrid_flag_t flags;  /**< Screenbuffer flags */
-        
+
         sysarg_t cols;          /**< Number of columns */
         sysarg_t rows;          /**< Number of rows */
-        
+
         sysarg_t col;           /**< Current column */
         sysarg_t row;           /**< Current row */
         bool cursor_visible;    /**< Cursor visibility */
-        
+
         char_attrs_t attrs;     /**< Current attributes */
-        
+
         sysarg_t top_row;       /**< The first row in the cyclic buffer */
         charfield_t data[];     /**< Screen contents (cyclic buffer) */

uspace/lib/c/include/io/console.h

@@ -49 +49 @@
         /** Console input file */
         FILE *input;
-        
+
         /** Console output file */
         FILE *output;
-        
+
         /** Console input session */
         async_sess_t *input_sess;
-        
+
         /** Console output session */
         async_sess_t *output_sess;
-        
+
         /** Input request call with timeout */
         ipc_call_t input_call;
-        
+
         /** Input response with timeout */
         aid_t input_aid;

uspace/lib/c/include/io/kbd_event.h

@@ -48 +48 @@
         /** List handle */
         link_t link;
-        
+
         /** Press or release event. */
         kbd_event_type_t type;
-        
+
         /** Keycode of the key that was pressed or released. */
         keycode_t key;
-        
+
         /** Bitmask of modifiers held. */
         keymod_t mods;
-        
+
         /** The character that was generated or '\0' for none. */
         wchar_t c;

uspace/lib/c/include/io/keycode.h

@@ -93 +93 @@
 
         KC_CAPS_LOCK,
-        
+
         KC_A,
         KC_S,
@@ -199 +199 @@
         KC_N0,
         KC_NPERIOD
-        
+
 } keycode_t;
 
@@ -212 +212 @@
         KM_NUM_LOCK    = 0x080,
         KM_SCROLL_LOCK = 0x100,
-        
+
         KM_SHIFT       = KM_LSHIFT | KM_RSHIFT,
         KM_CTRL        = KM_LCTRL | KM_RCTRL,

uspace/lib/c/include/io/mode.h

@@ -55 +55 @@
         sysarg_t index;
         sysarg_t version;
-        
+
         sysarg_t refresh_rate;
         aspect_ratio_t screen_aspect;
         sysarg_t screen_width;
         sysarg_t screen_height;
-        
+
         aspect_ratio_t cell_aspect;
         cell_visual_t cell_visual;

uspace/lib/c/include/io/pixelmap.h

@@ -47 +47 @@
         /* Pixels outside of a pixmap are PIXEL(0, 0, 0, 0) */
         PIXELMAP_EXTEND_TRANSPARENT_BLACK = 0,
-        
+
         /* The pixmap is repeated infinetely */
         PIXELMAP_EXTEND_TILE,
-        
+
         /* If outside of a pixmap, return closest pixel from the edge */
         PIXELMAP_EXTEND_SIDES,
-        
+
         /* If outside of a pixmap, return closest pixel from the edge,
          * with alpha = 0
@@ -125 +125 @@
                         transparent = transparent_outside;
                 }
-                
+
                 if (y < 0) {
                         y = 0;
@@ -135 +135 @@
                 }
         }
-        
+
         if (x < 0 || ((sysarg_t) x) >= pixmap->width ||
             y < 0 || ((sysarg_t) y) >= pixmap->height)
@@ -141 +141 @@
 
         pixel_t pixel = pixelmap_get_pixel(pixmap, x, y);
-        
+
         if (transparent)
                 pixel = PIXEL(0, RED(pixel), GREEN(pixel), BLUE(pixel));
-        
+
         return pixel;
 }

uspace/lib/c/include/io/printf_core.h

@@ -43 +43 @@
         /* String output function, returns number of printed characters or EOF */
         int (*str_write)(const char *, size_t, void *);
-        
+
         /* Wide string output function, returns number of printed characters or EOF */
         int (*wstr_write)(const wchar_t *, size_t, void *);
-        
+
         /* User data - output stream specification, state, locks, etc. */
         void *data;