Changeset a35b458 in mainline for uspace/app/barber/barber.c

Timestamp:

2018-03-02T20:10:49Z (6 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.

File:

• uspace/app/barber/barber.c (modified) (15 diffs)

uspace/app/barber/barber.c

@@ -106 +106 @@
                 }
         }
-        
+
         return true;
 }
@@ -120 +120 @@
         load_t *load = stats_get_load(&count);
         load_t load_val;
-        
+
         if ((load != NULL) && (count > 0)) {
                 load_val = load[0];
@@ -126 +126 @@
         } else
                 load_val = 0;
-        
+
         return load_val;
 }
@@ -138 +138 @@
          * a lower threshold.
          */
-        
+
         suseconds_t delta = 1000000 / fps;
         load_t load = get_load();
-        
+
         if ((delta >= render_time) && (load < MIN_LOAD))
                 fps++;
-        
+
         if (fps > MAX_FPS)
                 fps = MAX_FPS;
-        
+
         /*
          * If we lack behind then immediately
          * go to the lowest FPS.
          */
-        
+
         if (delta < render_time)
                 fps = MIN_FPS;
-        
+
         /*
          * Crank down the FPS if the current
          * load is above an upper threshold.
          */
-        
+
         if (load > MAX_LOAD)
                 fps--;
-        
+
         if (fps < MIN_FPS)
                 fps = MIN_FPS;
-        
+
         delta = 1000000 / fps;
-        
+
         fibril_timer_set(frame_timer, delta, frame_timer_callback, NULL);
 }
@@ -175 +175 @@
 {
         pixel_t next_led_color = led_colors[led_color];
-        
+
         led_color++;
         if (led_color >= LED_COLORS)
                 led_color = 0;
-        
+
         list_foreach(led_devs, link, led_dev_t, dev) {
                 if (dev->sess)
                         led_dev_color_set(dev->sess, next_led_color);
         }
-        
+
         plan_led_timer();
 }
@@ -192 +192 @@
         struct timeval prev;
         getuptime(&prev);
-        
+
         frame++;
         if (frame >= FRAMES)
                 frame = 0;
-        
+
         update_canvas(frame_canvas, frames[frame]);
-        
+
         struct timeval cur;
         getuptime(&cur);
-        
+
         plan_frame_timer(tv_sub_diff(&cur, &prev));
 }
@@ -211 +211 @@
         if (rc != EOK)
                 return;
-        
+
         service_id_t *svcs;
         size_t count;
@@ -217 +217 @@
         if (rc != EOK)
                 return;
-        
+
         for (size_t i = 0; i < count; i++) {
                 bool known = false;
-                
+
                 /* Determine whether we already know this device. */
                 list_foreach(led_devs, link, led_dev_t, dev) {
@@ -228 +228 @@
                         }
                 }
-                
+
                 if (!known) {
                         led_dev_t *dev = (led_dev_t *) calloc(1, sizeof(led_dev_t));
                         if (!dev)
                                 continue;
-                        
+
                         link_initialize(&dev->link);
                         dev->svc_id = svcs[i];
                         dev->sess = loc_service_connect(svcs[i], INTERFACE_DDF, 0);
-                        
+
                         list_append(&dev->link, &led_devs);
                 }
         }
-        
+
         // FIXME: Handle LED device removal
-        
+
         free(svcs);
 }
@@ -253 +253 @@
                 return 1;
         }
-        
+
         list_initialize(&led_devs);
         errno_t rc = loc_register_cat_change_cb(loc_callback);
@@ -260 +260 @@
                 return 1;
         }
-        
+
         led_timer = fibril_timer_create(NULL);
         if (!led_timer) {
@@ -266 +266 @@
                 return 1;
         }
-        
+
         frame_timer = fibril_timer_create(NULL);
         if (!frame_timer) {
@@ -272 +272 @@
                 return 1;
         }
-        
+
         if (!decode_frames())
                 return 1;
-        
+
         winreg = argv[1];
         window_t *main_window = window_open(argv[1], NULL,
@@ -283 +283 @@
                 return 1;
         }
-        
+
         frame_canvas = create_canvas(window_root(main_window), NULL,
             FRAME_WIDTH, FRAME_HEIGHT, frames[frame]);
-        
+
         if (!frame_canvas) {
                 window_close(main_window);
@@ -292 +292 @@
                 return 1;
         }
-        
+
         window_resize(main_window, 0, 0, FRAME_WIDTH + 8, FRAME_HEIGHT + 28,
             WINDOW_PLACEMENT_RIGHT | WINDOW_PLACEMENT_BOTTOM);
         window_exec(main_window);
-        
+
         plan_led_timer();
         plan_frame_timer(0);
-        
+
         task_retval(0);
         async_manager();
-        
+
         return 0;
 }