Changeset a35b458 in mainline for uspace/lib/posix/src/stdio.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/posix/src/stdio.c (modified) (9 diffs)

uspace/lib/posix/src/stdio.c

@@ -277 +277 @@
         size_t sz;
         char buf[4];
-        
+
         while (offset < size) {
                 sz = 0;
@@ -283 +283 @@
                         break;
                 }
-                
+
                 const int fildes = *(int *) fd;
                 size_t nwr;
                 if (vfs_write(fildes, &posix_pos[fildes], buf, sz, &nwr) != EOK)
                         break;
-                
+
                 chars++;
                 offset += sizeof(wchar_t);
         }
-        
+
         return chars;
 }
@@ -311 +311 @@
                 .data = &fildes
         };
-        
+
         return printf_core(format, &spec, ap);
 }
@@ -490 +490 @@
 {
         assert(L_tmpnam >= strlen("/tmp/tnXXXXXX"));
-        
+
         static char buffer[L_tmpnam + 1];
         if (s == NULL) {
                 s = buffer;
         }
-        
+
         strcpy(s, "/tmp/tnXXXXXX");
         mktemp(s);
-        
+
         if (*s == '\0') {
                 /* Errno set by mktemp(). */
                 return NULL;
         }
-        
+
         return s;
 }
@@ -518 +518 @@
         /* Sequence number of the filename. */
         static int seq = 0;
-        
+
         size_t dir_len = strlen(dir);
         if (dir[dir_len - 1] == '/') {
                 dir_len--;
         }
-        
+
         size_t pfx_len = strlen(pfx);
         if (pfx_len > 5) {
                 pfx_len = 5;
         }
-        
+
         char *result = malloc(dir_len + /* slash*/ 1 +
             pfx_len + /* three-digit seq */ 3 + /* .tmp */ 4 + /* nul */ 1);
-        
+
         if (result == NULL) {
                 errno = ENOMEM;
                 return NULL;
         }
-        
+
         char *res_ptr = result;
         strncpy(res_ptr, dir, dir_len);
@@ -542 +542 @@
         strncpy(res_ptr, pfx, pfx_len);
         res_ptr += pfx_len;
-        
+
         for (; seq < 1000; ++seq) {
                 snprintf(res_ptr, 8, "%03d.tmp", seq);
-                
+
                 int orig_errno = errno;
                 errno = EOK;
@@ -559 +559 @@
                 }
         }
-        
+
         if (seq == 1000) {
                 free(result);
@@ -565 +565 @@
                 return NULL;
         }
-        
+
         return result;
 }
@@ -585 +585 @@
                 return NULL;
         }
-        
+
         /* Unlink the created file, so that it's removed on close(). */
         unlink(filename);