public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: mornfall@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/daemons/common daemon-shared.c Date: Mon, 18 Jul 2011 14:42:00 -0000 [thread overview] Message-ID: <20110718144244.25566.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mornfall@sourceware.org 2011-07-18 14:42:44 Modified files: daemons/common : daemon-shared.c Log message: Improve format_buffer in daemon-shared.c, adding block formatting in addition to string/integer (this propagates to the *simple* family of request/response functionality). Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/common/daemon-shared.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4 --- LVM2/daemons/common/daemon-shared.c 2011/06/29 22:20:14 1.3 +++ LVM2/daemons/common/daemon-shared.c 2011/07/18 14:42:44 1.4 @@ -2,6 +2,7 @@ #include <stdio.h> #include <malloc.h> #include <string.h> +#include <assert.h> #include "daemon-shared.h" /* @@ -74,30 +75,34 @@ { char *buffer, *old; char *next; - char *format; + int keylen; dm_asprintf(&buffer, "%s = \"%s\"\n", what, id); if (!buffer) goto fail; while (next = va_arg(ap, char *)) { old = buffer; - if (strstr(next, "%d") || strstr(next, "%s")) { - dm_asprintf(&format, "%%s%s\n", next); - if (!format) goto fail; - - if (strstr(format, "%d")) - dm_asprintf(&buffer, format, buffer, va_arg(ap, int)); - else - dm_asprintf(&buffer, format, buffer, va_arg(ap, char *)); - - dm_free(format); + assert(strchr(next, '=')); + keylen = strchr(next, '=') - next; + if (strstr(next, "%d")) { + int value = va_arg(ap, int); + dm_asprintf(&buffer, "%s%.*s= %d\n", buffer, keylen, next, value); + dm_free(old); + } else if (strstr(next, "%s")) { + char *value = va_arg(ap, char *); + dm_asprintf(&buffer, "%s%.*s= \"%s\"\n", buffer, keylen, next, value); + dm_free(old); + } else if (strstr(next, "%b")) { + char *block = va_arg(ap, char *); + if (!block) + continue; + dm_asprintf(&buffer, "%s%.*s%s", buffer, keylen, next, block); dm_free(old); - if (!buffer) goto fail; } else { dm_asprintf(&buffer, "%s%s", buffer, next); dm_free(old); - if (!buffer) goto fail; } + if (!buffer) goto fail; } old = buffer;
next reply other threads:[~2011-07-18 14:42 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-18 14:42 mornfall [this message] 2012-01-16 5:09 mornfall 2012-01-19 15:59 zkabelac
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20110718144244.25566.qmail@sourceware.org \ --to=mornfall@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).