Changeset 3baec29 in mainline

Timestamp:

2011-04-09T16:35:59Z (14 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:

2e08dce7

Parents:

f5c8046

Message:

cpp: will it blend

Location:

uspace/app

Files:

• cpp (added)
• pcc/cc/cpp/Makefile (added)
• pcc/cc/cpp/config.h (added)
• pcc/cc/cpp/cpp.c (modified) (10 diffs)
• pcc/cc/cpp/token.c (modified) (3 diffs)
• pcc/config.h (added)
• pcc/mip/config.h (added)

uspace/app/pcc/cc/cpp/cpp.c

@@ -37 +37 @@
 #include <sys/wait.h>
 #endif
-#include <sys/stat.h>
+#include <compat/sys/stat.h>
 
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#include <compat/unistd.h>
 #endif
 #include <stdio.h>
@@ -47 +47 @@
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
+#include <compat/time.h>
 #include <ctype.h>
 
@@ -403 +403 @@
         usch *osp;
         usch *fn, *safefn;
-        int c, it;
+        int c;
 
         if (flslvl)
@@ -437 +437 @@
                 if (c != '\n')
                         goto bad;
-                it = SYSINC;
+                (void) SYSINC;
                 safefn = fn;
         } else {
@@ -870 +870 @@
         usch *t;
         usch *sb = stringbuf;
-        int dummy;
 
         flbuf();
@@ -878 +877 @@
                 write (2, t, strlen((char *)t));
         }
-        dummy = write (2, s, strlen((char *)s));
-        dummy = write (2, "\n", 1);
+        write (2, s, strlen((char *)s));
+        write (2, "\n", 1);
         stringbuf = sb;
 }
@@ -887 +886 @@
 {
         usch *t;
-        int dummy;
 
         flbuf();
@@ -893 +891 @@
         if (ifiles != NULL) {
                 t = sheap("%s:%d: error: ", ifiles->fname, ifiles->lineno);
-                dummy = write (2, t, strlen((char *)t));
-        }
-        dummy = write (2, s, strlen((char *)s));
-        dummy = write (2, "\n", 1);
+                write (2, t, strlen((char *)t));
+        }
+        write (2, s, strlen((char *)s));
+        write (2, "\n", 1);
         exit(1);
 }
@@ -1863 +1861 @@
         struct tree *w, *new, *last;
         int len, cix, bit, fbit, svbit, ix, bitno;
-        const usch *k, *m, *sm;
+        const usch *k, *m;
 
         /* Count full string length */
@@ -1898 +1896 @@
         sp = (struct symtab *)w;
 
-        sm = m = sp->namep;
+        m = sp->namep;
         k = key;
 

uspace/app/pcc/cc/cpp/token.c

@@ -45 +45 @@
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#include <compat/ctype.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -183 +183 @@
 {
         struct symtab *nl;
-        int ch, i, ccnt, onemore;
+        int ch, i, ccnt;
         usch *cp;
 
@@ -357 +357 @@
                                 goto xloop;
                         }
-                        onemore = i = ccnt = 0;
+                        i = ccnt = 0;
                         do {
                                 yytext[i++] = (usch)ch;