Changeset 4b54bd9 in mainline for uspace/lib/pcut/src/preproc.c

Timestamp:

2018-09-12T13:23:03Z (6 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

3da0ee4

Parents:

275530a4

Message:

Update PCUT to latest revision

File:

• uspace/lib/pcut/src/preproc.c (modified) (6 diffs)

uspace/lib/pcut/src/preproc.c

@@ -27 +27 @@
  */
 
-#include <stdbool.h>
+#pragma warning(push, 0)
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#pragma warning(pop)
+
 
 #define MAX_IDENTIFIER_LENGTH 256
@@ -37 +39 @@
 static int counter = 0;
 
-static void print_numbered_identifier(int value, FILE *output)
-{
+static void print_numbered_identifier(int value, FILE *output) {
         fprintf(output, "pcut_item_%d", value);
 }
 
-static void print_numbered_identifier2(int value, FILE *output)
-{
+static void print_numbered_identifier2(int value, FILE *output) {
         fprintf(output, "pcut_item2_%d", value);
 }
 
-static void print_numbered_identifier3(int value, FILE *output)
-{
+static void print_numbered_identifier3(int value, FILE *output) {
         fprintf(output, "pcut_item3_%d", value);
 }
@@ -57 +56 @@
 } identifier_t;
 
-static void identifier_init(identifier_t *identifier)
-{
+static void identifier_init(identifier_t *identifier) {
         identifier->name[0] = 0;
         identifier->length = 0;
 }
 
-static void identifier_add_char(identifier_t *identifier, char c)
-{
+static void identifier_add_char(identifier_t *identifier, char c) {
         if (identifier->length + 1 >= MAX_IDENTIFIER_LENGTH) {
                 fprintf(stderr, "Identifier %s is too long, aborting!\n", identifier->name);
@@ -75 +72 @@
 }
 
-static void identifier_print_or_expand(identifier_t *identifier, FILE *output)
-{
+static void identifier_print_or_expand(identifier_t *identifier, FILE *output) {
         const char *name = identifier->name;
         if (strcmp(name, "PCUT_ITEM_NAME") == 0) {
@@ -93 +89 @@
 }
 
-static int is_identifier_char(int c, int inside_identifier)
-{
-        return isalpha(c) || (c == '_') || (inside_identifier && isdigit(c));
+static int is_identifier_char(int c, int inside_identifier) {
+        return isalpha(c) || (c == '_')
+                        || (inside_identifier && isdigit(c));
 }
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         FILE *input = stdin;
         FILE *output = stdout;
@@ -110 +105 @@
         (void) argv;
 
-        while (true) {
+        while (1) {
                 int current_char_denotes_identifier;