New upstream version 3.0.5upstream/3.0.5

2 files changed, 33 insertions, 33 deletions

diff --git a/zfs/ZfsArcMeter.c b/zfs/ZfsArcMeter.c
index e844d77..91dfc71 100644
--- a/zfs/ZfsArcMeter.c
+++ b/zfs/ZfsArcMeter.c
@@ -50,29 +50,29 @@ static void ZfsArcMeter_display(const Object* cast, RichString* out) {
 
    if (this->values[5] > 0) {
       char buffer[50];
-      Meter_humanUnit(buffer, this->total, 50);
-      RichString_append(out, CRT_colors[METER_VALUE], buffer);
-      Meter_humanUnit(buffer, this->values[5], 50);
-      RichString_append(out, CRT_colors[METER_TEXT], " Used:");
-      RichString_append(out, CRT_colors[METER_VALUE], buffer);
-      Meter_humanUnit(buffer, this->values[0], 50);
-      RichString_append(out, CRT_colors[METER_TEXT], " MFU:");
-      RichString_append(out, CRT_colors[ZFS_MFU], buffer);
-      Meter_humanUnit(buffer, this->values[1], 50);
-      RichString_append(out, CRT_colors[METER_TEXT], " MRU:");
-      RichString_append(out, CRT_colors[ZFS_MRU], buffer);
-      Meter_humanUnit(buffer, this->values[2], 50);
-      RichString_append(out, CRT_colors[METER_TEXT], " Anon:");
-      RichString_append(out, CRT_colors[ZFS_ANON], buffer);
-      Meter_humanUnit(buffer, this->values[3], 50);
-      RichString_append(out, CRT_colors[METER_TEXT], " Hdr:");
-      RichString_append(out, CRT_colors[ZFS_HEADER], buffer);
-      Meter_humanUnit(buffer, this->values[4], 50);
-      RichString_append(out, CRT_colors[METER_TEXT], " Oth:");
-      RichString_append(out, CRT_colors[ZFS_OTHER], buffer);
+      Meter_humanUnit(buffer, this->total, sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      Meter_humanUnit(buffer, this->values[5], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Used:");
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      Meter_humanUnit(buffer, this->values[0], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " MFU:");
+      RichString_appendAscii(out, CRT_colors[ZFS_MFU], buffer);
+      Meter_humanUnit(buffer, this->values[1], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " MRU:");
+      RichString_appendAscii(out, CRT_colors[ZFS_MRU], buffer);
+      Meter_humanUnit(buffer, this->values[2], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Anon:");
+      RichString_appendAscii(out, CRT_colors[ZFS_ANON], buffer);
+      Meter_humanUnit(buffer, this->values[3], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Hdr:");
+      RichString_appendAscii(out, CRT_colors[ZFS_HEADER], buffer);
+      Meter_humanUnit(buffer, this->values[4], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Oth:");
+      RichString_appendAscii(out, CRT_colors[ZFS_OTHER], buffer);
    } else {
-      RichString_write(out, CRT_colors[METER_TEXT], " ");
-      RichString_append(out, CRT_colors[FAILED_SEARCH], "Unavailable");
+      RichString_writeAscii(out, CRT_colors[METER_TEXT], " ");
+      RichString_appendAscii(out, CRT_colors[FAILED_SEARCH], "Unavailable");
    }
 }
 
diff --git a/zfs/ZfsCompressedArcMeter.c b/zfs/ZfsCompressedArcMeter.c
index 8766f80..92d82e9 100644
--- a/zfs/ZfsCompressedArcMeter.c
+++ b/zfs/ZfsCompressedArcMeter.c
@@ -47,18 +47,18 @@ static void ZfsCompressedArcMeter_display(const Object* cast, RichString* out) {
 
    if (this->values[0] > 0) {
       char buffer[50];
-      Meter_humanUnit(buffer, this->total, 50);
-      RichString_append(out, CRT_colors[METER_VALUE], buffer);
-      RichString_append(out, CRT_colors[METER_TEXT], " Uncompressed, ");
-      Meter_humanUnit(buffer, this->values[0], 50);
-      RichString_append(out, CRT_colors[METER_VALUE], buffer);
-      RichString_append(out, CRT_colors[METER_TEXT], " Compressed, ");
-      ZfsCompressedArcMeter_printRatioString(this, buffer, 50);
-      RichString_append(out, CRT_colors[METER_VALUE], buffer);
-      RichString_append(out, CRT_colors[METER_TEXT], " Ratio");
+      Meter_humanUnit(buffer, this->total, sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Uncompressed, ");
+      Meter_humanUnit(buffer, this->values[0], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Compressed, ");
+      ZfsCompressedArcMeter_printRatioString(this, buffer, sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Ratio");
    } else {
-      RichString_write(out, CRT_colors[METER_TEXT], " ");
-      RichString_append(out, CRT_colors[FAILED_SEARCH], "Compression Unavailable");
+      RichString_writeAscii(out, CRT_colors[METER_TEXT], " ");
+      RichString_appendAscii(out, CRT_colors[FAILED_SEARCH], "Compression Unavailable");
    }
 }