From ab94d8390d03151349901ecf329be4a7b889cd23 Mon Sep 17 00:00:00 2001 From: Thomas Porzelt Date: Wed, 4 Aug 2010 22:04:00 +0200 Subject: [PATCH] [core] Change *bit integer suffixes in config parser --- src/main/config_parser.rl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/config_parser.rl b/src/main/config_parser.rl index eb9432b..62cda90 100644 --- a/src/main/config_parser.rl +++ b/src/main/config_parser.rl @@ -74,10 +74,10 @@ else if (g_str_equal(str->str, "gbyte")) o->data.number *= 1024 * 1024 * 1024; else if (g_str_equal(str->str, "tbyte")) o->data.number *= 1024 * 1024 * 1024 * G_GINT64_CONSTANT(1024); - else if (g_str_equal(str->str, "kbit")) o->data.number *= 1000; - else if (g_str_equal(str->str, "mbit")) o->data.number *= 1000 * 1000; - else if (g_str_equal(str->str, "gbit")) o->data.number *= 1000 * 1000 * 1000; - else if (g_str_equal(str->str, "tbit")) o->data.number *= 1000 * 1000 * 1000 * G_GINT64_CONSTANT(1000); + else if (g_str_equal(str->str, "kbit")) o->data.number *= 1024 / 8; + else if (g_str_equal(str->str, "mbit")) o->data.number *= 1024 * 1024 / 8; + else if (g_str_equal(str->str, "gbit")) o->data.number *= 1024 * 1024 * 1024 / 8; + else if (g_str_equal(str->str, "tbit")) o->data.number *= 1024 * 1024 * 1024 * G_GINT64_CONSTANT(1024) / 8; else if (g_str_equal(str->str, "min")) o->data.number *= 60; else if (g_str_equal(str->str, "hours")) o->data.number *= 60 * 60;