Changeset a35b458 in mainline for uspace/app/tester/stdio


Ignore:
Timestamp:
2018-03-02T20:10:49Z (8 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/app/tester/stdio
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/tester/stdio/stdio1.c

    r3061bc1 ra35b458  
    4242        FILE *file;
    4343        const char *file_name = "/textdemo";
    44        
     44
    4545        TPRINTF("Open file \"%s\"...", file_name);
    4646        errno = 0;
    … …  
    5151        } else
    5252                TPRINTF("OK\n");
    53        
     53
    5454        TPRINTF("Read file...");
    5555        size_t cnt = fread(buf, 1, BUF_SIZE, file);
    … …  
    6060        } else
    6161                TPRINTF("OK\n");
    62        
     62
    6363        buf[cnt] = '\0';
    6464        TPRINTF("Read %zu bytes, string \"%s\"\n", cnt, buf);
    65        
     65
    6666        TPRINTF("Seek to beginning...");
    6767        if (fseek(file, 0, SEEK_SET) != 0) {
    … …  
    7171        } else
    7272                TPRINTF("OK\n");
    73        
     73
    7474        TPRINTF("Read using fgetc()...");
    7575        while (true) {
    … …  
    7777                if (c == EOF)
    7878                        break;
    79                
     79
    8080                TPRINTF(".");
    8181        }
    8282        TPRINTF("[EOF]\n");
    83        
     83
    8484        TPRINTF("Close...");
    8585        if (fclose(file) != 0) {
    … …  
    8888        } else
    8989                TPRINTF("OK\n");
    90        
     90
    9191        return NULL;
    9292}

  • uspace/app/tester/stdio/stdio2.c

    r3061bc1 ra35b458  
    3838        FILE *file;
    3939        const char *file_name = "/test";
    40        
     40
    4141        TPRINTF("Open file \"%s\" for writing...", file_name);
    4242        errno = 0;
    … …  
    4747        } else
    4848                TPRINTF("OK\n");
    49        
     49
    5050        TPRINTF("Write to file...");
    5151        fprintf(file, "integer: %u, string: \"%s\"", 42, "Hello!");
    5252        TPRINTF("OK\n");
    53        
     53
    5454        TPRINTF("Close...");
    5555        if (fclose(file) != 0) {
    … …  
    5858        } else
    5959                TPRINTF("OK\n");
    60        
     60
    6161        TPRINTF("Open file \"%s\" for reading...", file_name);
    6262        file = fopen(file_name, "rt");
    … …  
    6666        } else
    6767                TPRINTF("OK\n");
    68        
     68
    6969        TPRINTF("File contains:\n");
    7070        while (true) {
    … …  
    7474                TPRINTF("%c", c);
    7575        }
    76        
     76
    7777        TPRINTF("\nClose...");
    7878        if (fclose(file) != 0) {
    … …  
    8181        } else
    8282                TPRINTF("OK\n");
    83        
     83
    8484        return NULL;
    8585}
Note: See TracChangeset for help on using the changeset viewer.