projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypt: Rename RSA functions.
[paraslash.git]
/
string.h
diff --git
a/string.h
b/string.h
index 230f654b67a8e553e37e2f7635fbfe057e63cfca..10251ae7c10b734bd906a644e0832e29b9e6bd9c 100644
(file)
--- a/
string.h
+++ b/
string.h
@@
-1,10
+1,6
@@
-/*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
- *
- * 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 sy
bm
ols from string.c */
+/** \file string.h exported sy
mb
ols from string.c */
/** Flags that change how content is printed into the buffer. */
enum para_buffer_flags {
/** Flags that change how content is printed into the buffer. */
enum para_buffer_flags {
@@
-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,24
+48,22
@@
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, ...) (\
{ \
#define WRITE_STATUS_ITEM(b, n, f, ...) (\
{ \
- int _ret; \
if ((b)->flags & PBF_SIZE_PREFIX) { \
if ((b)->flags & PBF_SIZE_PREFIX) { \
-
_ret = para_printf((b), "%02x:" f,
n, ## __VA_ARGS__); \
+
para_printf((b), "%02x:" f, (unsigned)
n, ## __VA_ARGS__); \
} else { \
} else { \
-
_ret =
para_printf((b), "%s: " f, status_item_list[(n)], \
+ para_printf((b), "%s: " f, status_item_list[(n)], \
## __VA_ARGS__); \
} \
## __VA_ARGS__); \
} \
- _ret; \
} \
)
} \
)
@@
-84,7
+78,6
@@
__must_check __malloc __printf_1_2 char *make_message(const char *fmt, ...);
__must_check __malloc char *para_strcat(char *a, const char *b);
__must_check __malloc char *para_dirname(const char *name);
__must_check char *para_basename(const char *name);
__must_check __malloc char *para_strcat(char *a, const char *b);
__must_check __malloc char *para_dirname(const char *name);
__must_check char *para_basename(const char *name);
-void chop(char *buf);
__must_check __malloc char *para_logname(void);
__must_check __malloc char *para_homedir(void);
__malloc char *para_hostname(void);
__must_check __malloc char *para_logname(void);
__must_check __malloc char *para_homedir(void);
__malloc char *para_hostname(void);
@@
-102,3
+95,7
@@
void freep(void *arg);
int compute_word_num(const char *buf, const char *delim, int offset);
char *safe_strdup(const char *src, size_t len);
char *key_value_copy(const char *src, size_t len, const char *key);
int compute_word_num(const char *buf, const char *delim, int offset);
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);
+__must_check int sanitize_str(const char *src, size_t max_width,
+ char **result, size_t *width);