From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 9 May 2013 18:04:44 +0000 (-0700)
Subject: armor: don't break lines by default
X-Git-Tag: v0.67-rc1~128^2~134
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=619a68a396d3a4b6dbcebcce75932a65b7788915;p=ceph.git

armor: don't break lines by default

Added a new function that breaks the lines, but by default
don't do it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/common/armor.c b/src/common/armor.c
index 0fd2c918c27..706e01e7f22 100644
--- a/src/common/armor.c
+++ b/src/common/armor.c
@@ -45,7 +45,7 @@ static int set_str_val(char **pdst, const char *end, char c)
 	return 0;
 }
 
-int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
+int ceph_armor_line_break(char *dst, const char *dst_end, const char *src, const char *end, int line_width)
 {
 	int olen = 0;
 	int line = 0;
@@ -82,7 +82,7 @@ int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
 		}
 		olen += 4;
 		line += 4;
-		if (line == 64) {
+		if (line_width && line == line_width) {
 			line = 0;
 			SET_DST('\n');
 			olen++;
@@ -91,6 +91,11 @@ int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
 	return olen;
 }
 
+int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
+{
+	return ceph_armor_line_break(dst, dst_end, src, end, 0);
+}
+
 int ceph_unarmor(char *dst, const char *dst_end, const char *src, const char *end)
 {
 	int olen = 0;
diff --git a/src/common/armor.h b/src/common/armor.h
index cf9a63aa149..340b33aaf57 100644
--- a/src/common/armor.h
+++ b/src/common/armor.h
@@ -7,6 +7,10 @@ extern "C" {
 
 int ceph_armor(char *dst, const char *dst_end,
 	       const char *src, const char *end);
+
+int ceph_armor_linebreak(char *dst, const char *dst_end,
+	       const char *src, const char *end,
+	       int line_width);
 int ceph_unarmor(char *dst, const char *dst_end,
 		 const char *src, const char *end);
 #ifdef __cplusplus