From patchwork Mon Nov 2 14:20:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zdenek Kabelac X-Patchwork-Id: 57022 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA2EKjCu029896 for ; Mon, 2 Nov 2009 14:20:45 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id A677A619D5A; Mon, 2 Nov 2009 09:20:38 -0500 (EST) Received: from int-mx02.intmail.prod.int.phx2.redhat.com (nat-pool.util.phx.redhat.com [10.8.5.200]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id nA2EKZjx012313 for ; Mon, 2 Nov 2009 09:20:35 -0500 Received: from dhcp-0-185.brq.redhat.com (dhcp-0-185.brq.redhat.com [10.34.0.185]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nA2EKX7w005442 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 2 Nov 2009 09:20:35 -0500 Received: from dhcp-0-185.brq.redhat.com (dhcp-0-185.brq.redhat.com [127.0.0.1]) by dhcp-0-185.brq.redhat.com (8.14.3/8.14.3) with ESMTP id nA2EKXnR008457; Mon, 2 Nov 2009 15:20:33 +0100 Received: (from kabi@localhost) by dhcp-0-185.brq.redhat.com (8.14.3/8.14.3/Submit) id nA2EKXVU008456; Mon, 2 Nov 2009 15:20:33 +0100 From: Zdenek Kabelac To: dm-devel@redhat.com Date: Mon, 2 Nov 2009 15:20:08 +0100 Message-Id: <1257171622-8380-5-git-send-email-zkabelac@redhat.com> In-Reply-To: <1257171622-8380-4-git-send-email-zkabelac@redhat.com> References: <1257171622-8380-1-git-send-email-zkabelac@redhat.com> <1257171622-8380-2-git-send-email-zkabelac@redhat.com> <1257171622-8380-3-git-send-email-zkabelac@redhat.com> <1257171622-8380-4-git-send-email-zkabelac@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-loop: dm-devel@redhat.com Cc: Zdenek Kabelac Subject: [dm-devel] [PATCH 04/18] Export outfc() macro and out_text_with_comment() X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com diff --git a/lib/format_text/export.c b/lib/format_text/export.c index f25b80e..f683b37 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -286,9 +286,9 @@ int out_hint(struct formatter *f, const char *fmt, ...) } /* - * Appends a comment + * The normal output function with comment */ -static int _out_comment(struct formatter *f, const char *comment, const char *fmt, ...) +int out_text_with_comment(struct formatter *f, const char *comment, const char *fmt, ...) { va_list ap; int r; @@ -579,7 +579,7 @@ static int _print_lv(struct formatter *f, struct logical_volume *lv) switch (lv->read_ahead) { case DM_READ_AHEAD_NONE: - _out_comment(f, "# None", "read_ahead = -1"); + outfc(f, "# None", "read_ahead = -1"); break; case DM_READ_AHEAD_AUTO: /* No output - use default */ diff --git a/lib/format_text/text_export.h b/lib/format_text/text_export.h index a452439..63c8999 100644 --- a/lib/format_text/text_export.h +++ b/lib/format_text/text_export.h @@ -18,6 +18,7 @@ #define outsz(args...) do {if (!out_size(args)) return_0;} while (0) #define outhnt(args...) do {if (!out_hint(args)) return_0;} while (0) +#define outfc(args...) do {if (!out_text_with_comment(args)) return_0;} while (0) #define outf(args...) do {if (!out_text(args)) return_0;} while (0) #define outnl(f) do {if (!out_newline(f)) return_0;} while (0) @@ -39,6 +40,9 @@ int out_config_node(struct formatter *f, const struct config_node *cn); int out_areas(struct formatter *f, const struct lv_segment *seg, const char *type); +int out_text_with_comment(struct formatter *f, const char* comment, const char *fmt, ...) + __attribute__ ((format(printf, 3, 4))); + void out_inc_indent(struct formatter *f); void out_dec_indent(struct formatter *f); int out_newline(struct formatter *f);