Changeset ec1bdc8 in mainline for uspace/lib/c/include/adt/measured_strings.h

Timestamp:

2010-09-26T18:57:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3fe57ea7

Parents:

2a786f9 (diff), 70ce016 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/net.

File:

• uspace/lib/c/include/adt/measured_strings.h (moved) (moved from uspace/lib/socket/include/net_err.h ) (1 diff)

uspace/lib/c/include/adt/measured_strings.h

@@ -27 +27 @@
  */
 
-/** @addtogroup net
- * @{
+/** @addtogroup libc
+ *  @{
  */
 
 /** @file
- * Common error processing codes and routines.
+ * Character string with measured length.
+ * The structure has been designed for serialization of character strings
+ * between modules.
  */
 
-#ifndef __NET_ERR_H__
-#define __NET_ERR_H__
+#ifndef LIBC_MEASURED_STRINGS_H_
+#define LIBC_MEASURED_STRINGS_H_
 
-#include <errno.h>
+#include <sys/types.h>
 
-#ifdef CONFIG_DEBUG
-        #include <stdio.h>
-        #include <str_error.h>
-#endif
+/** Type definition of the character string with measured length.
+ *  @see measured_string
+ */
+typedef struct measured_string measured_string_t;
 
-/** An actual stored error code.
+/** Type definition of the character string with measured length pointer.
+ *  @see measured_string
+ */
+typedef measured_string_t *measured_string_ref;
+
+/** Character string with measured length.
  *
+ * This structure has been designed for serialization of character strings
+ * between modules.
  */
-#define ERROR_CODE  error_check_return_value
+struct measured_string {
+        /** Character string data. */
+        char * value;
+        /** Character string length. */
+        size_t length;
+};
 
-/** An error processing routines declaration.
- *
- * This has to be declared in the block where the error processing
- * is desired.
- *
- */
-#define ERROR_DECLARE  int ERROR_CODE
-
-/** Store the value as an error code and checks if an error occurred.
- *
- * @param[in] value The value to be checked. May be a function call.
- * @return False if the value indicates success (EOK).
- * @return True otherwise.
- *
- */
-#ifdef CONFIG_DEBUG
-
-#define ERROR_OCCURRED(value) \
-        (((ERROR_CODE = (value)) != EOK) \
-        && ({ \
-                fprintf(stderr, "libsocket error at %s:%d (%s)\n", \
-                __FILE__, __LINE__, str_error(ERROR_CODE)); \
-                1; \
-        }))
-
-#else
-
-#define ERROR_OCCURRED(value)  ((ERROR_CODE = (value)) != EOK)
-
-#endif
-
-#define ERROR_NONE(value)       !ERROR_OCCURRED((value))
-
-/** Error propagation
- *
- * Check if an error occurred and immediately exit the actual
- * function returning the error code.
- *
- * @param[in] value The value to be checked. May be a function call.
- *
- */
-
-#define ERROR_PROPAGATE(value) \
-        if (ERROR_OCCURRED(value)) \
-                return ERROR_CODE
+extern measured_string_ref measured_string_create_bulk(const char *, size_t);
+extern measured_string_ref measured_string_copy(measured_string_ref);
+extern int measured_strings_receive(measured_string_ref *, char **, size_t);
+extern int measured_strings_reply(const measured_string_ref, size_t);
+extern int measured_strings_return(int, measured_string_ref *, char **, size_t);
+extern int measured_strings_send(int, const measured_string_ref, size_t);
 
 #endif