6 files changed, 25 insertions, 14 deletions
diff --git a/src/com_local.h b/src/com_local.h
index 176591b..84ede45 100644
--- a/src/com_local.h
+++ b/src/com_local.h
@@ -531,6 +531,9 @@ size_t      Com_Time_m( char *buffer, size_t size );
 size_t      Com_Uptime_m( char *buffer, size_t size );
 size_t      Com_UptimeLong_m( char *buffer, size_t size );
 
+size_t      Com_FormatSize( char *dest, size_t bytes, size_t size );
+size_t      Com_FormatSizeLong( char *dest, size_t bytes, size_t size );
+
 uint32_t    Com_BlockChecksum( void *buffer, size_t len );
 
 void        Com_PageInMemory( void *buffer, size_t size );
diff --git a/src/common.c b/src/common.c
index 048af5b..e4990f1 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1336,6 +1336,26 @@ size_t Com_TimeDiffLong( char *buffer, size_t size, time_t *p, time_t now ) {
     return Com_FormatTimeLong( buffer, size, diff );
 }
 
+size_t Com_FormatSize( char *dest, size_t bytes, size_t size ) {
+    if( bytes >= 1000000 ) {
+        return Q_scnprintf( dest, size, "%2.1fM", ( float )bytes / 1000000 );
+    }
+    if( bytes >= 1000 ) {
+        return Q_scnprintf( dest, size, "%3"PRIz"K", bytes / 1000 );
+    }
+    return Q_scnprintf( dest, size, "%3"PRIz, bytes );
+}
+
+size_t Com_FormatSizeLong( char *dest, size_t bytes, size_t size ) {
+    if( bytes >= 1000000 ) {
+        return Q_scnprintf( dest, size, "%2.1f MB", ( float )bytes / 1000000 );
+    }
+    if( bytes >= 1000 ) {
+        return Q_scnprintf( dest, size, "%3"PRIz" KB", bytes / 1000 );
+    }
+    return Q_scnprintf( dest, size, "%3"PRIz" byte%s", bytes, bytes == 1 ? "" : "s"  );
+}
+
 /*
 ==============================================================================
 
diff --git a/src/mvd_client.c b/src/mvd_client.c
index bdb447e..b99bbe6 100644
--- a/src/mvd_client.c
+++ b/src/mvd_client.c
@@ -1518,7 +1518,7 @@ static void list_recordings( void ) {
             if( pos < 0 ) {
                 strcpy( buffer, "???" );
             } else {
-                COM_FormatFileSize( buffer, pos, sizeof( buffer ) );
+                Com_FormatSize( buffer, pos, sizeof( buffer ) );
             }
         } else {
             strcpy( buffer, "-" );
diff --git a/src/q_shared.c b/src/q_shared.c
index a032749..877b13a 100644
--- a/src/q_shared.c
+++ b/src/q_shared.c
@@ -422,16 +422,6 @@ qboolean COM_iswhite( const char *s ) {
     return qtrue;
 }
 
-size_t COM_FormatFileSize( char *dest, size_t bytes, size_t size ) {
-    if( bytes >= 1000000 ) {
-        return Q_snprintf( dest, size, "%2.1fM", ( float )bytes / 1000000 );
-    }
-    if( bytes >= 1000 ) {
-        return Q_snprintf( dest, size, "%3"PRIz"K", bytes / 1000 );
-    }
-    return Q_snprintf( dest, size, "%3"PRIz, bytes );
-}
-
 /*
 ============
 va
diff --git a/src/q_shared.h b/src/q_shared.h
index 131cbfe..3d356b6 100644
--- a/src/q_shared.h
+++ b/src/q_shared.h
@@ -463,8 +463,6 @@ int QDECL SortStricmp( const void *p1, const void *p2 );
 size_t COM_strclr( char *s ); 
 qboolean COM_iswhite( const char *s );
 
-size_t COM_FormatFileSize( char *dest, size_t bytes, size_t size );
-
 // buffer safe operations
 size_t Q_strlcpy( char *dst, const char *src, size_t size );
 size_t Q_strlcat( char *dst, const char *src, size_t size );
diff --git a/src/ui_demos.c b/src/ui_demos.c
index ab75fd7..2a8a4e1 100644
--- a/src/ui_demos.c
+++ b/src/ui_demos.c
@@ -85,7 +85,7 @@ static void BuildName( file_info_t *info, char **cache ) {
         CL_GetDemoInfo( buffer, &demo );
     }
 
-    COM_FormatFileSize( buffer, info->size, sizeof( buffer ) );
+    Com_FormatSize( buffer, info->size, sizeof( buffer ) );
 
     e = UI_FormatColumns( DEMO_EXTRASIZE,
         info->name, buffer, demo.map, demo.pov, NULL );