Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=7821fb27c86958d71f8b277742a01f9a76335f3a
commit 7821fb27c86958d71f8b277742a01f9a76335f3a
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Fri Jan 18 19:57:34 2008 +0100
added a new fsize() function for more human-readable size names
it prints "%d MB" if the size is less than 1GB, and it returns the previous "%d
GB" if the size is bigger than 1GB
diff --git a/src/plugins/formatdisk.c b/src/plugins/formatdisk.c
index 8a40bc9..94e872f 100644
--- a/src/plugins/formatdisk.c
+++ b/src/plugins/formatdisk.c
@@ -77,10 +77,12 @@ int partdetails(PedPartition *part, int noswap)
// for dialog menus
parts = g_list_append(parts, pname);
- parts = g_list_append(parts, g_strdup_printf("%dGB\t%s",
(int)part->geom.length/1953125, ptype));
+ ptr = fsize(part->geom.length);
+ parts = g_list_append(parts, g_strdup_printf("%s\t%s", ptr, ptype));
// for dialog checklists
partschk = g_list_append(partschk, pname);
- partschk = g_list_append(partschk, g_strdup_printf("%dGB %s",
(int)part->geom.length/1953125, ptype));
+ partschk = g_list_append(partschk, g_strdup_printf("%s %s", ptr,
ptype));
+ FREE(ptr);
partschk = g_list_append(partschk, strdup("Off"));
return(0);
diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c
index 1226160..bb0f577 100644
--- a/src/plugins/partdisk.c
+++ b/src/plugins/partdisk.c
@@ -83,6 +83,7 @@ GList *listparts(void)
{
GList *devs=NULL;
PedDevice *dev=NULL;
+ char *ptr;
// silly raid autodetect, md0 always created
if(buggy_md0())
@@ -100,7 +101,9 @@ GList *listparts(void)
// we don't want to partition cds ;-)
continue;
devs = g_list_append(devs, dev->path);
- devs = g_list_append(devs, g_strdup_printf("%dGB\t%s",
(int)dev->length/1953125, dev->model));
+ ptr = fsize(dev->length);
+ devs = g_list_append(devs, g_strdup_printf("%s\t%s", ptr,
dev->model));
+ FREE(ptr);
}
return(devs);
diff --git a/src/util.c b/src/util.c
index fb2ba18..a86361a 100644
--- a/src/util.c
+++ b/src/util.c
@@ -721,3 +721,11 @@ void cb_log(unsigned short level, char *msg)
{
LOG("[libpacman, level %d] %s", level, msg);
}
+
+char *fsize(int length)
+{
+ if(length/1953125 == 0)
+ return g_strdup_printf("%d MB", length/1907);
+ else
+ return g_strdup_printf("%d GB", length/1953125);
+}
diff --git a/src/util.h b/src/util.h
index ec1b129..b0b5de3 100644
--- a/src/util.h
+++ b/src/util.h
@@ -77,3 +77,4 @@ void show_menu(GList *plugin_list, int *state);
int setup_log(char *file, int line, char *fmt, ...);
#define LOG(fmt, args...) setup_log(__FILE__, __LINE__, fmt, ##args)
void cb_log(unsigned short level, char *msg);
+char *fsize(int length);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
