Changeset 10de842 in mainline

Timestamp:

2018-01-04T19:28:42Z (7 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:

0d0b319

Parents:

db3089d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 19:18:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 19:28:42)

Message:

Change the way errno_t is defined, and put libhttp and libext4 error codes in <errno.h>.

Files:

• Makefile (modified) (1 diff)
• abi/include/_bits/errno.h (added)
• abi/include/_bits/opaque_handle.h (moved) (moved from uspace/lib/http/include/http/errno.h ) (2 diffs)
• abi/include/abi/errno.h (modified) (1 diff)
• abi/include/abi/errno.in (modified) (1 diff)
• abi/include/abi/ipc/ipc.h (modified) (2 diffs)
• kernel/generic/include/errno.h (modified) (1 diff)
• kernel/generic/include/typedefs.h (modified) (1 diff)
• uspace/app/sbi/src/mytypes.h (modified) (1 diff)
• uspace/lib/c/include/errno.h (modified) (1 diff)
• uspace/lib/c/include/types/common.h (modified) (1 diff)
• uspace/lib/ext4/include/ext4/types.h (modified) (1 diff)
• uspace/lib/http/src/headers.c (modified) (2 diffs)
• uspace/lib/http/src/response.c (modified) (2 diffs)

Makefile

@@ -136 +136 @@
 $(ERRNO_HEADER): $(ERRNO_INPUT)
         echo '/* Generated file. Edit errno.in instead. */' > $@.new
-        sed 's/__errno_entry(\([^,]*\),\([^,]*\),.*/#define \1 \2/' < $< >> $@.new
+        sed 's/__errno_entry(\([^,]*\),\([^,]*\),.*/#define \1 __errno_t(\2)/' < $< >> $@.new
         mv $@.new $@
 

abi/include/_bits/opaque_handle.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Martin Sucha
+ * Copyright (c) 2017 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup http
+/* Authors:
+ *      Jiří Zárevúcky (jzr) <zarevucky.jiri@gmail.com>
+ */
+
+/** @addtogroup bits
  * @{
  */
-/**
- * @file
- */
 
-#ifndef HTTP_ERRNO_H_
-#define HTTP_ERRNO_H_
+#ifndef _BITS_OPAQUE_HANDLE_H_
+#define _BITS_OPAQUE_HANDLE_H_
 
-#include <errno.h>
-
-#define HTTP_EMULTIPLE_HEADERS -20001
-#define HTTP_EMISSING_HEADER -20002
-#define HTTP_EPARSE -20003
+#define opaque_handle(__name) typedef struct __opaque_##__name *__name
 
 #endif

abi/include/abi/errno.h

@@ -1 +1 @@
 /* Generated file. Edit errno.in instead. */
-#define EOK                   0
-#define ENOENT               -1
-#define ENOMEM               -2
-#define ELIMIT               -3
-#define EREFUSED             -4
-#define EFORWARD             -5
-#define EPERM                -6
-#define EHANGUP              -7
-#define EPARTY               -8
-#define EEXIST               -9
-#define EBADMEM             -10
-#define ENOTSUP             -11
-#define EADDRNOTAVAIL       -12
-#define ETIMEOUT            -13
-#define EINVAL              -14
-#define EBUSY               -15
-#define EOVERFLOW           -16
-#define EINTR               -17
-#define EMFILE              -18
-#define ENAMETOOLONG       -256
-#define EISDIR             -257
-#define ENOTDIR            -258
-#define ENOSPC             -259
-#define ENOTEMPTY          -261
-#define EBADF              -262
-#define EDOM               -263
-#define ERANGE             -264
-#define EXDEV              -265
-#define EIO                -266
-#define EMLINK             -267
-#define ENXIO              -268
-#define ENOFS              -269
-#define EBADCHECKSUM       -300
-#define ESTALL             -301
-#define EEMPTY             -302
-#define ENAK               -303
-#define EAGAIN           -11002
+#define EOK             __errno_t(      0)
+#define ENOENT          __errno_t(     -1)
+#define ENOMEM          __errno_t(     -2)
+#define ELIMIT          __errno_t(     -3)
+#define EREFUSED        __errno_t(     -4)
+#define EFORWARD        __errno_t(     -5)
+#define EPERM           __errno_t(     -6)
+#define EHANGUP         __errno_t(     -7)
+#define EPARTY          __errno_t(     -8)
+#define EEXIST          __errno_t(     -9)
+#define EBADMEM         __errno_t(    -10)
+#define ENOTSUP         __errno_t(    -11)
+#define EADDRNOTAVAIL   __errno_t(    -12)
+#define ETIMEOUT        __errno_t(    -13)
+#define EINVAL          __errno_t(    -14)
+#define EBUSY           __errno_t(    -15)
+#define EOVERFLOW       __errno_t(    -16)
+#define EINTR           __errno_t(    -17)
+#define EMFILE          __errno_t(    -18)
+#define ENAMETOOLONG    __errno_t(   -256)
+#define EISDIR          __errno_t(   -257)
+#define ENOTDIR         __errno_t(   -258)
+#define ENOSPC          __errno_t(   -259)
+#define ENOTEMPTY       __errno_t(   -261)
+#define EBADF           __errno_t(   -262)
+#define EDOM            __errno_t(   -263)
+#define ERANGE          __errno_t(   -264)
+#define EXDEV           __errno_t(   -265)
+#define EIO             __errno_t(   -266)
+#define EMLINK          __errno_t(   -267)
+#define ENXIO           __errno_t(   -268)
+#define ENOFS           __errno_t(   -269)
+#define EBADCHECKSUM    __errno_t(   -300)
+#define ESTALL          __errno_t(   -301)
+#define EEMPTY          __errno_t(   -302)
+#define ENAK            __errno_t(   -303)
+#define EAGAIN          __errno_t( -11002)
+
+#define HTTP_EMULTIPLE_HEADERS  __errno_t( -20001)
+#define HTTP_EMISSING_HEADER    __errno_t( -20002)
+#define HTTP_EPARSE             __errno_t( -20003)
+
+#define EXT4_ERR_BAD_DX_DIR     __errno_t( -75000)

abi/include/abi/errno.in

@@ -35 +35 @@
 __errno_entry(EEMPTY         ,   -302, "Resource is empty")
 __errno_entry(ENAK           ,   -303, "Negative acknowledgement")
-__errno_entry(EAGAIN         , -11002, "Operation could not proceed. Try again.")
+__errno_entry(EAGAIN         , -11002, "Operation could not proceed, try again")
+
+__errno_entry(HTTP_EMULTIPLE_HEADERS , -20001, "HTTP: Multiple headers")  // libhttp error codes. Defining them here is a temporary hack.
+__errno_entry(HTTP_EMISSING_HEADER   , -20002, "HTTP: Missing header")
+__errno_entry(HTTP_EPARSE            , -20003, "HTTP: Parse error")
+
+__errno_entry(EXT4_ERR_BAD_DX_DIR    , -75000, "EXT4: Filesystem corrupted")  // libext4

abi/include/abi/ipc/ipc.h

@@ -70 +70 @@
 
 /* Macros for manipulating calling data */
-#define IPC_SET_RETVAL(data, retval)  ((data).args[0] = (retval))
+#define IPC_SET_RETVAL(data, retval)  ((data).args[0] = (sysarg_t) (retval))
 #define IPC_SET_IMETHOD(data, val)    ((data).args[0] = (val))
 #define IPC_SET_ARG1(data, val)       ((data).args[1] = (val))
@@ -79 +79 @@
 
 #define IPC_GET_IMETHOD(data)  ((data).args[0])
-#define IPC_GET_RETVAL(data)   ((data).args[0])
+#define IPC_GET_RETVAL(data)   ((errno_t) (data).args[0])
 
 #define IPC_GET_ARG1(data)  ((data).args[1])

kernel/generic/include/errno.h

@@ -36 +36 @@
 #define KERN_ERRNO_H_
 
-typedef int errno_t;
-
+#include <_bits/errno.h>
 #include <abi/errno.h>
 

kernel/generic/include/typedefs.h

@@ -37 +37 @@
 
 #include <arch/types.h>
+#include <_bits/errno.h>
 
 typedef struct {

uspace/app/sbi/src/mytypes.h

@@ -53 +53 @@
 /** We need NULL defined. */
 #include <stddef.h>
+
+#ifndef EOK
 #define EOK 0
+#endif
 
 #include "bigint_t.h"

uspace/lib/c/include/errno.h

@@ -36 +36 @@
 #define LIBC_ERRNO_H_
 
-typedef int errno_t;
-
+#include <_bits/errno.h>
 #include <abi/errno.h>
 

uspace/lib/c/include/types/common.h

@@ -45 +45 @@
 
 #include <_bits/all.h>
+#include <_bits/errno.h>
 
 #endif

uspace/lib/ext4/include/ext4/types.h

@@ -476 +476 @@
 } ext4_directory_dx_block_t;
 
-#define EXT4_ERR_BAD_DX_DIR       (-75000)
 #define EXT4_DIRECTORY_HTREE_EOF  UINT32_C(0x7fffffff)
 

uspace/lib/http/src/headers.c

@@ -34 +34 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41 +42 @@
 #include <http/http.h>
 #include <http/ctype.h>
-#include <http/errno.h>
 
 #define HTTP_HEADER_LINE "%s: %s\r\n"

uspace/lib/http/src/response.c

@@ -34 +34 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40 +41 @@
 
 #include <http/http.h>
-#include <http/errno.h>
 
 static bool is_digit(char c)