Changeset a35b458 in mainline for uspace/lib/c/generic/io/vsnprintf.c

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.

File:

• uspace/lib/c/generic/io/vsnprintf.c (modified) (6 diffs)

uspace/lib/c/generic/io/vsnprintf.c

@@ -65 +65 @@
 {
         size_t left = data->size - data->len;
-        
+
         if (left == 0)
                 return ((int) size);
-        
+
         if (left == 1) {
                 /* We have only one free byte left in buffer
@@ -77 +77 @@
                 return ((int) size);
         }
-        
+
         if (left <= size) {
                 /* We do not have enough space for the whole string
@@ -84 +84 @@
                  */
                 size_t index = 0;
-                
+
                 while (index < size) {
                         wchar_t uc = str_decode(str, &index, size);
-                        
+
                         if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK)
                                 break;
                 }
-                
+
                 /* Put trailing zero at end, but not count it
                  * into data->len so it could be rewritten next time
                  */
                 data->dst[data->len] = 0;
-                
+
                 return ((int) size);
         }
-        
+
         /* Buffer is big enough to print the whole string */
         memcpy((void *)(data->dst + data->len), (void *) str, size);
         data->len += size;
-        
+
         /* Put trailing zero at end, but not count it
          * into data->len so it could be rewritten next time
          */
         data->dst[data->len] = 0;
-        
+
         return ((int) size);
 }
@@ -132 +132 @@
 {
         size_t index = 0;
-        
+
         while (index < (size / sizeof(wchar_t))) {
                 size_t left = data->size - data->len;
-                
+
                 if (left == 0)
                         return ((int) size);
-                
+
                 if (left == 1) {
                         /* We have only one free byte left in buffer
@@ -147 +147 @@
                         return ((int) size);
                 }
-                
+
                 if (chr_encode(str[index], data->dst, &data->len, data->size - 1) != EOK)
                         break;
-                
+
                 index++;
         }
-        
+
         /* Put trailing zero at end, but not count it
          * into data->len so it could be rewritten next time
          */
         data->dst[data->len] = 0;
-        
+
         return ((int) size);
 }
@@ -174 +174 @@
                 &data
         };
-        
+
         /* Print 0 at end of string - fix the case that nothing will be printed */
         if (size > 0)
                 str[0] = 0;
-        
+
         /* vsnprintf_write ensures that str will be terminated by zero. */
         return printf_core(fmt, &ps, ap);