Changeset 0b4a67a in mainline for uspace

Timestamp:

2010-11-20T15:33:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7e1f9b7

Parents:

a9c6b966

Message:

Use a more portable definition of NULL.

Location:

uspace

Files:

• app/bdsh/cmds/builtins/builtins.h (modified) (1 diff)
• app/nettest1/nettest1.c (modified) (1 diff)
• app/nettest2/nettest2.c (modified) (1 diff)
• lib/c/arch/abs32le/src/stacktrace.c (modified) (1 diff)
• lib/c/arch/abs32le/src/tls.c (modified) (1 diff)
• lib/c/generic/async.c (modified) (2 diffs)
• lib/c/generic/io/klog.c (modified) (1 diff)
• lib/c/include/unistd.h (modified) (1 diff)
• srv/hid/kbd/genarch/gsp.c (modified) (1 diff)
• srv/hw/netif/dp8390/dp8390.c (modified) (2 diffs)
• srv/hw/netif/dp8390/dp8390_module.c (modified) (1 diff)

uspace/app/bdsh/cmds/builtins/builtins.h

@@ -10 +10 @@
 #include "cd/cd_def.h"
 #include "exit/exit_def.h"
-        {NULL, NULL, NULL, NULL, NULL}
+        {NULL, NULL, NULL, NULL, 0}
 };
 

uspace/app/nettest1/nettest1.c

@@ -388 +388 @@
                 return ENOMEM;
         }
-        socket_ids[sockets] = NULL;
+        socket_ids[sockets] = 0;
 
         if (verbose)

uspace/app/nettest2/nettest2.c

@@ -336 +336 @@
                 return ENOMEM;
         }
-        socket_ids[sockets] = NULL;
+        socket_ids[sockets] = 0;
 
         if (verbose)

uspace/lib/c/arch/abs32le/src/stacktrace.c

@@ -56 +56 @@
 uintptr_t stacktrace_fp_get(void)
 {
-        return NULL;
+        return (uintptr_t) NULL;
 }
 
 uintptr_t stacktrace_pc_get(void)
 {
-        return NULL;
+        return (uintptr_t) NULL;
 }
 

uspace/lib/c/arch/abs32le/src/tls.c

@@ -46 +46 @@
 uintptr_t __aeabi_read_tp(void)
 {
-        return NULL;
+        return (uintptr_t) NULL;
 }
 

uspace/lib/c/generic/async.c

@@ -536 +536 @@
                 if (callid)
                         ipc_answer_0(callid, ENOMEM);
-                return NULL;
+                return (uintptr_t) NULL;
         }
         
@@ -556 +556 @@
                 if (callid)
                         ipc_answer_0(callid, ENOMEM);
-                return NULL;
+                return (uintptr_t) NULL;
         }
         

uspace/lib/c/generic/io/klog.c

@@ -52 +52 @@
 void klog_update(void)
 {
-        (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0);
+        (void) __SYSCALL3(SYS_KLOG, 1, (uintptr_t) NULL, 0);
 }
 

uspace/lib/c/include/unistd.h

@@ -41 +41 @@
 
 #ifndef NULL
-        #define NULL  0UL
+        #define NULL    ((void *) 0)
 #endif
 

uspace/srv/hid/kbd/genarch/gsp.c

@@ -198 +198 @@
         if (t == NULL) {
                 printf("gsp_step: not found\n");
-                *mods = NULL;
-                *key = NULL;
+                *mods = 0;
+                *key = 0;
                 return 0;
         }

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -432 +432 @@
         dep->de_write_iovec.iod_iovec[0].iov_size = size;
         dep->de_write_iovec.iod_iovec_s = 1;
-        dep->de_write_iovec.iod_iovec_addr = NULL;
+        dep->de_write_iovec.iod_iovec_addr = (uintptr_t) NULL;
 
         if (size < ETH_MIN_PACK_SIZE || size > ETH_MAX_PACK_SIZE_TAGGED)
@@ -1015 +1015 @@
         dep->de_read_iovec.iod_iovec[0].iov_size = length;
         dep->de_read_iovec.iod_iovec_s = 1;
-        dep->de_read_iovec.iod_iovec_addr = NULL;
+        dep->de_read_iovec.iod_iovec_addr = (uintptr_t) NULL;
 
         last = page + (length - 1) / DP_PAGESIZE;

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -127 +127 @@
                 dep->received_count = 0;
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                nil_received_msg(phone, device_id, received, NULL);
+                nil_received_msg(phone, device_id, received, SERVICE_NONE);
         }else{
                 fibril_rwlock_write_unlock(&netif_globals.lock);