shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Add comments & remove always-included header.

Browse Source
This commit is contained in:
Alasdair Kergon 2011-09-01 17:58:27 +00:00
parent 1ca0eea5bb
commit 79b9c65b6b
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libdm/libdm-string.c
View File

@ -13,7 +13,6 @@
*/ */
#include "dmlib.h" #include "dmlib.h"
#include "libdevmapper.h"
#include <ctype.h> #include <ctype.h>
@ -179,6 +178,12 @@ static void _count_chars(const char *str, size_t *len, int *count,
(*count)++; (*count)++;
} }
/*
* Count occurrences of 'c' in 'str' of length 'size'.
*
* Returns:
* Number of occurrences of 'c'
*/
unsigned dm_count_chars(const char *str, size_t len, const int c) unsigned dm_count_chars(const char *str, size_t len, const int c)
{ {
size_t i; size_t i;
@ -191,6 +196,9 @@ unsigned dm_count_chars(const char *str, size_t len, const int c)
return count; return count;
} }
/*
* Length of string after escaping double quotes and backslashes.
*/
size_t dm_escaped_len(const char *str) size_t dm_escaped_len(const char *str)
{ {
size_t len = 1; size_t len = 1;
@ -289,6 +297,9 @@ static void _quote_hyphens(char **out, const char *src)
_quote_characters(out, src, '-', '-', 0); _quote_characters(out, src, '-', '-', 0);
} }
/*
* <vg>-<lv>-<layer> or if !layer just <vg>-<lv>.
*/
char *dm_build_dm_name(struct dm_pool *mem, const char *vgname, char *dm_build_dm_name(struct dm_pool *mem, const char *vgname,
const char *lvname, const char *layer) const char *lvname, const char *layer)
{ {
@ -328,7 +339,7 @@ char *dm_build_dm_name(struct dm_pool *mem, const char *vgname,
return r; return r;
} }
char *dm_build_dm_uuid(struct dm_pool *mem, const char *prefix, const char *lvid, const char *layer) char *dm_build_dm_uuid(struct dm_pool *mem, const char *uuid_prefix, const char *lvid, const char *layer)
{ {
char *dmuuid; char *dmuuid;
size_t len; size_t len;
@ -336,7 +347,7 @@ char *dm_build_dm_uuid(struct dm_pool *mem, const char *prefix, const char *lvid
if (!layer) if (!layer)
layer = ""; layer = "";
len = strlen(prefix) + strlen(lvid) + strlen(layer) + 1; len = strlen(uuid_prefix) + strlen(lvid) + strlen(layer) + 1;
if (!(dmuuid = dm_pool_alloc(mem, len))) { if (!(dmuuid = dm_pool_alloc(mem, len))) {
log_error("build_dm_name: Allocation failed for %" PRIsize_t log_error("build_dm_name: Allocation failed for %" PRIsize_t
@ -344,7 +355,7 @@ char *dm_build_dm_uuid(struct dm_pool *mem, const char *prefix, const char *lvid
return NULL; return NULL;
} }
sprintf(dmuuid, "%s%s%s%s", prefix, lvid, (*layer) ? "-" : "", layer); sprintf(dmuuid, "%s%s%s%s", uuid_prefix, lvid, (*layer) ? "-" : "", layer);
return dmuuid; return dmuuid;
} }
@ -362,11 +373,20 @@ char *dm_escape_double_quotes(char *out, const char *src)
return out; return out;
} }
/*
* Undo quoting in situ.
*/
void dm_unescape_double_quotes(char *src) void dm_unescape_double_quotes(char *src)
{ {
_unquote_one_character(src, '\"', '\\'); _unquote_one_character(src, '\"', '\\');
} }
/*
* Unescape colons and "at" signs in situ and save the substrings
* starting at the position of the first unescaped colon and the
* first unescaped "at" sign. This is normally used to unescape
* device names used as PVs.
*/
void dm_unescape_colons_and_at_signs(char *src, void dm_unescape_colons_and_at_signs(char *src,
char **substr_first_unquoted_colon, char **substr_first_unquoted_colon,
char **substr_first_unquoted_at_sign) char **substr_first_unquoted_at_sign)