Changeset f019cc07 in mainline

Timestamp:

2009-08-02T19:08:22Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

5b3cf90

Parents:

a405563

Message:

More warnings.

Location:

uspace/app

Files:

• init/init.c (modified) (2 diffs)
• trace/proto.c (modified) (1 diff)
• trace/trace.c (modified) (7 diffs)

uspace/app/init/init.c

@@ -203 +203 @@
 }
 
-void mount_data(void)
+static void mount_data(void)
 {
         int rc;
@@ -246 +246 @@
         srv_start("/srv/ata_bd");
         srv_start("/srv/gxe_bd");
-#endif  
+#else
+        (void) srv_start;
+#endif
+
 #ifdef CONFIG_MOUNT_DATA
         mount_data();
+#else
+        (void) mount_data;
 #endif
 

uspace/app/trace/proto.c

@@ -47 +47 @@
 
 typedef struct {
-        int srv;
+        unsigned srv;
         proto_t *proto;
         link_t link;

uspace/app/trace/trace.c

@@ -207 +207 @@
 void val_print(sysarg_t val, val_type_t v_type)
 {
+        long sval;
+
+        sval = (long) val;
+
         switch (v_type) {
         case V_VOID:
@@ -213 +217 @@
 
         case V_INTEGER:
-                printf("%ld", val);
+                printf("%ld", sval);
                 break;
 
@@ -222 +226 @@
 
         case V_ERRNO:
-                if (val >= -15 && val <= 0) {
-                        printf("%ld %s (%s)", val,
-                            err_desc[-val].name,
-                            err_desc[-val].desc);
+                if (sval >= -15 && sval <= 0) {
+                        printf("%ld %s (%s)", sval,
+                            err_desc[-sval].name,
+                            err_desc[-sval].desc);
                 } else {
-                        printf("%ld", val);
+                        printf("%ld", sval);
                 }
                 break;
         case V_INT_ERRNO:
-                if (val >= -15 && val < 0) {
-                        printf("%ld %s (%s)", val,
-                            err_desc[-val].name,
-                            err_desc[-val].desc);
+                if (sval >= -15 && sval < 0) {
+                        printf("%ld %s (%s)", sval,
+                            err_desc[-sval].name,
+                            err_desc[-sval].desc);
                 } else {
-                        printf("%ld", val);
+                        printf("%ld", sval);
                 }
                 break;
 
         case V_CHAR:
-                if (val >= 0x20 && val < 0x7f) {
-                        printf("'%c'", val);
+                if (sval >= 0x20 && sval < 0x7f) {
+                        printf("'%c'", sval);
                 } else {
-                        switch (val) {
+                        switch (sval) {
                         case '\a': printf("'\\a'"); break;
                         case '\b': printf("'\\b'"); break;
@@ -283 +287 @@
         ipcarg_t phoneid;
         
-        if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY)
+        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
+            sc_rc == (sysarg_t) IPC_CALLRET_TEMPORARY)
                 return;
 
@@ -303 +308 @@
         int rc;
 
-        if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY)
+        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
+            sc_rc == (sysarg_t) IPC_CALLRET_TEMPORARY)
                 return;
 
@@ -344 +350 @@
 static void sc_ipc_call_sync_slow_b(unsigned thread_id, sysarg_t *sc_args)
 {
-        ipc_call_t question, reply;
+        ipc_call_t question;
         int rc;
 
         memset(&question, 0, sizeof(question));
-        rc = udebug_mem_read(phoneid, &question.args, sc_args[1], sizeof(question.args));
+        rc = udebug_mem_read(phoneid, &question.args, sc_args[1],
+            sizeof(question.args));
+
         if (rc < 0) {
                 printf("Error: mem_read->%d\n", rc);
@@ -359 +367 @@
 static void sc_ipc_call_sync_slow_e(unsigned thread_id, sysarg_t *sc_args)
 {
-        ipc_call_t question, reply;
+        ipc_call_t reply;
         int rc;
 
         memset(&reply, 0, sizeof(reply));
-        rc = udebug_mem_read(phoneid, &reply.args, sc_args[2], sizeof(reply.args));
+        rc = udebug_mem_read(phoneid, &reply.args, sc_args[2],
+            sizeof(reply.args));
+
         if (rc < 0) {
                 printf("Error: mem_read->%d\n", rc);