Merge branch 'dl/compat-cleanup'

diff --git a/strbuf.c b/strbuf.c
index 0e18b259ce51fc73f82f7b77032221b33411c25f..aa48d179a9aec236069fc88501c5c26c3569d502 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -774,8 +774,10 @@ void strbuf_addstr_xml_quoted(struct strbuf *buf, const char *s)
        }
 }
 
-static int is_rfc3986_reserved(char ch)
+int is_rfc3986_reserved_or_unreserved(char ch)
 {
+       if (is_rfc3986_unreserved(ch))
+               return 1;
        switch (ch) {
                case '!': case '*': case '\'': case '(': case ')': case ';':
                case ':': case '@': case '&': case '=': case '+': case '$':
@@ -785,20 +787,19 @@ static int is_rfc3986_reserved(char ch)
        return 0;
 }
 
-static int is_rfc3986_unreserved(char ch)
+int is_rfc3986_unreserved(char ch)
 {
        return isalnum(ch) ||
                ch == '-' || ch == '_' || ch == '.' || ch == '~';
 }
 
 static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
-                                int reserved)
+                                char_predicate allow_unencoded_fn)
 {
        strbuf_grow(sb, len);
        while (len--) {
                char ch = *s++;
-               if (is_rfc3986_unreserved(ch) ||
-                   (!reserved && is_rfc3986_reserved(ch)))
+               if (allow_unencoded_fn(ch))
                        strbuf_addch(sb, ch);
                else
                        strbuf_addf(sb, "%%%02x", (unsigned char)ch);
@@ -806,30 +807,62 @@ static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
 }
 
 void strbuf_addstr_urlencode(struct strbuf *sb, const char *s,
-                            int reserved)
+                            char_predicate allow_unencoded_fn)
 {
-       strbuf_add_urlencode(sb, s, strlen(s), reserved);
+       strbuf_add_urlencode(sb, s, strlen(s), allow_unencoded_fn);
 }
 
-void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
+static void strbuf_humanise(struct strbuf *buf, off_t bytes,
+                                int humanise_rate)
 {
        if (bytes > 1 << 30) {
-               strbuf_addf(buf, "%u.%2.2u GiB",
+               strbuf_addf(buf,
+                               humanise_rate == 0 ?
+                                       /* TRANSLATORS: IEC 80000-13:2008 gibibyte */
+                                       _("%u.%2.2u GiB") :
+                                       /* TRANSLATORS: IEC 80000-13:2008 gibibyte/second */
+                                       _("%u.%2.2u GiB/s"),
                            (unsigned)(bytes >> 30),
                            (unsigned)(bytes & ((1 << 30) - 1)) / 10737419);
        } else if (bytes > 1 << 20) {
                unsigned x = bytes + 5243;  /* for rounding */
-               strbuf_addf(buf, "%u.%2.2u MiB",
+               strbuf_addf(buf,
+                               humanise_rate == 0 ?
+                                       /* TRANSLATORS: IEC 80000-13:2008 mebibyte */
+                                       _("%u.%2.2u MiB") :
+                                       /* TRANSLATORS: IEC 80000-13:2008 mebibyte/second */
+                                       _("%u.%2.2u MiB/s"),
                            x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
        } else if (bytes > 1 << 10) {
                unsigned x = bytes + 5;  /* for rounding */
-               strbuf_addf(buf, "%u.%2.2u KiB",
+               strbuf_addf(buf,
+                               humanise_rate == 0 ?
+                                       /* TRANSLATORS: IEC 80000-13:2008 kibibyte */
+                                       _("%u.%2.2u KiB") :
+                                       /* TRANSLATORS: IEC 80000-13:2008 kibibyte/second */
+                                       _("%u.%2.2u KiB/s"),
                            x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
        } else {
-               strbuf_addf(buf, "%u bytes", (unsigned)bytes);
+               strbuf_addf(buf,
+                               humanise_rate == 0 ?
+                                       /* TRANSLATORS: IEC 80000-13:2008 byte */
+                                       Q_("%u byte", "%u bytes", (unsigned)bytes) :
+                                       /* TRANSLATORS: IEC 80000-13:2008 byte/second */
+                                       Q_("%u byte/s", "%u bytes/s", (unsigned)bytes),
+                               (unsigned)bytes);
        }
 }
 
+void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
+{
+       strbuf_humanise(buf, bytes, 0);
+}
+
+void strbuf_humanise_rate(struct strbuf *buf, off_t bytes)
+{
+       strbuf_humanise(buf, bytes, 1);
+}
+
 void strbuf_add_absolute_path(struct strbuf *sb, const char *path)
 {
        if (!*path)