From 436e6d2d44c6a1c9e5ab96b83fc61db6363d5c85 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 27 Feb 2015 01:47:38 +0000 Subject: [PATCH] CMM: update libraries git-svn-id: svn://kolibrios.org@5483 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 1 - programs/cmm/lib/encoding.h | 12 ------------ programs/cmm/lib/file_system.h | 13 +++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 5438ee70fb..dc2c82dced 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -16,7 +16,6 @@ #include "..\lib\lib.obj\box_lib.h" #include "..\lib\file_system.h" #include "..\lib\figures.h" -#include "..\lib\encoding.h" #include "..\lib\list_box.h" #include "..\lib\copyf.h" #include "..\lib\random.h" diff --git a/programs/cmm/lib/encoding.h b/programs/cmm/lib/encoding.h index c4a0a4a86d..d5aeaaaa22 100644 --- a/programs/cmm/lib/encoding.h +++ b/programs/cmm/lib/encoding.h @@ -165,15 +165,3 @@ inline fastcall void utf8rutodos( ESI) } -:dword ConvertSize(unsigned int bytes) -{ - unsigned char size_prefix[8], size_nm[4]; - if (bytes>=1073741824) strcpy(#size_nm, " Gb"); - else if (bytes>=1048576) strcpy(#size_nm, " Mb"); - else if (bytes>=1024) strcpy(#size_nm, " Kb"); - else strcpy(#size_nm, " b "); - while (bytes>1023) bytes/=1024; - itoa_(#size_prefix, bytes); - strcat(#size_prefix, #size_nm); - return #size_prefix; -} \ No newline at end of file diff --git a/programs/cmm/lib/file_system.h b/programs/cmm/lib/file_system.h index f70d4e73b9..04e20c8582 100644 --- a/programs/cmm/lib/file_system.h +++ b/programs/cmm/lib/file_system.h @@ -234,3 +234,16 @@ enum } return #absolute_path; } + +:dword ConvertSize(unsigned int bytes) +{ + unsigned char size_prefix[8], size_nm[4]; + if (bytes>=1073741824) strcpy(#size_nm, " Gb"); + else if (bytes>=1048576) strcpy(#size_nm, " Mb"); + else if (bytes>=1024) strcpy(#size_nm, " Kb"); + else strcpy(#size_nm, " b "); + while (bytes>1023) bytes/=1024; + itoa_(#size_prefix, bytes); + strcat(#size_prefix, #size_nm); + return #size_prefix; +} \ No newline at end of file