crypt: Rename RSA functions.

[paraslash.git] / string.h

diff --git a/string.h b/string.h
index 61bb7c25b04998ed1c6616240f2e51f6627a5360..10251ae7c10b734bd906a644e0832e29b9e6bd9c 100644 (file)
--- a/string.h
+++ b/string.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */

 
 /** \file string.h exported symbols from string.c */
 
 
 /** \file string.h exported symbols from string.c */
 


@@ -20,7 +16,7 @@ struct para_buffer {
        size_t size;
        /** The maximal size this buffer may grow. Zero means unlimited. */
        size_t max_size;
        size_t size;
        /** The maximal size this buffer may grow. Zero means unlimited. */
        size_t max_size;

-       /** \sa para_buffer_flags. */
+       /** \sa \ref para_buffer_flags. */

        unsigned flags;
        /** The next para_printf() will write at this offset. */
        size_t offset;
        unsigned flags;
        /** The next para_printf() will write at this offset. */
        size_t offset;


@@ -37,7 +33,7 @@ struct para_buffer {
 /**
  * Controls the behavior of for_each_line().
  *
 /**
  * Controls the behavior of for_each_line().
  *

- * \sa for_each_line().
+ * \sa \ref for_each_line().

  */
 enum for_each_line_flags {
        /** Activate read-only mode. */
  */
 enum for_each_line_flags {
        /** Activate read-only mode. */


@@ -52,18 +48,18 @@ int for_each_line(unsigned flags, char *buf, size_t size,
                line_handler_t *line_handler, void *private_data);
 
 /**
                line_handler_t *line_handler, void *private_data);
 
 /**

-  * Write the contents of a status item to a para_buffer.
-  *
-  * \param b The para_buffer.
-  * \param n The number of the status item.
-  * \param f A format string.
-  *
-  * \return The return value of the underlying call to para_printf().
-  */
+ * Write the contents of a status item to a para_buffer.
+ *
+ * \param b The para_buffer.
+ * \param n The number of the status item.
+ * \param f A format string.
+ *
+ * \return The return value of the underlying call to \ref para_printf().
+ */

 #define WRITE_STATUS_ITEM(b, n, f, ...) (\
 { \
        if ((b)->flags & PBF_SIZE_PREFIX) { \
 #define WRITE_STATUS_ITEM(b, n, f, ...) (\
 { \
        if ((b)->flags & PBF_SIZE_PREFIX) { \

-               para_printf((b), "%02x:" f, n, ## __VA_ARGS__); \
+               para_printf((b), "%02x:" f, (unsigned)n, ## __VA_ARGS__); \

        } else { \
                para_printf((b), "%s: " f, status_item_list[(n)], \
                        ## __VA_ARGS__); \
        } else { \
                para_printf((b), "%s: " f, status_item_list[(n)], \
                        ## __VA_ARGS__); \


@@ -101,3 +97,5 @@ char *safe_strdup(const char *src, size_t len);
 char *key_value_copy(const char *src, size_t len, const char *key);
 int skip_cells(const char *s, size_t cells_to_skip, size_t *result);
 __must_check int strwidth(const char *s, size_t *result);
 char *key_value_copy(const char *src, size_t len, const char *key);
 int skip_cells(const char *s, size_t cells_to_skip, size_t *result);
 __must_check int strwidth(const char *s, size_t *result);

+__must_check int sanitize_str(const char *src, size_t max_width,
+               char **result, size_t *width);