[parted-devel] libparted/unit.c: constify interfaces

[Jim Meyering]

More pseudo-mechanical changes:

	libparted/unit.c: constify interfaces
	* libparted/unit.c (ped_unit_get_size):
	(ped_unit_format_custom_byte, ped_unit_format_byte):
	(ped_unit_format_custom, ped_unit_format, ped_unit_parse):
	(find_suffix, parse_chs, clip, geometry_from_centre_radius):
	(ped_unit_parse_custom):
	* include/parted/unit.h: Update prototypes, too.

diff --git a/include/parted/unit.h b/include/parted/unit.h
index 253db7b..a7d3d41 100644
--- a/include/parted/unit.h
+++ b/include/parted/unit.h
@@ -1,6 +1,6 @@
 /*
     libparted - a library for manipulating disk partitions
-    Copyright (C) 2005 Free Software Foundation, Inc.
+    Copyright (C) 2005, 2007 Free Software Foundation, Inc.

     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -65,24 +65,25 @@ typedef enum {
 #define PED_UNIT_FIRST PED_UNIT_SECTOR
 #define PED_UNIT_LAST PED_UNIT_TEBIBYTE

-extern long long ped_unit_get_size (PedDevice* dev, PedUnit unit);
+extern long long ped_unit_get_size (const PedDevice* dev, PedUnit unit);
 extern const char* ped_unit_get_name (PedUnit unit);
 extern PedUnit ped_unit_get_by_name (const char* unit_name);

 extern void ped_unit_set_default (PedUnit unit);
 extern PedUnit ped_unit_get_default ();

-extern char* ped_unit_format_byte (PedDevice* dev, PedSector byte);
-extern char* ped_unit_format_custom_byte (PedDevice* dev, PedSector byte,
+extern char* ped_unit_format_byte (const PedDevice* dev, PedSector byte);
+extern char* ped_unit_format_custom_byte (const PedDevice* dev, PedSector byte,
 					  PedUnit unit);

-extern char* ped_unit_format (PedDevice* dev, PedSector sector);
-extern char* ped_unit_format_custom (PedDevice* dev, PedSector sector,
+extern char* ped_unit_format (const PedDevice* dev, PedSector sector);
+extern char* ped_unit_format_custom (const PedDevice* dev, PedSector sector,
 				     PedUnit unit);

-extern int ped_unit_parse (const char* str, PedDevice* dev, PedSector* sector,
+extern int ped_unit_parse (const char* str, const PedDevice* dev,
+                           PedSector* sector,
 			   PedGeometry** range);
-extern int ped_unit_parse_custom (const char* str, PedDevice* dev,
+extern int ped_unit_parse_custom (const char* str, const PedDevice* dev,
 				  PedUnit unit, PedSector* sector,
 				  PedGeometry** range);

diff --git a/libparted/unit.c b/libparted/unit.c
index 930276a..4810246 100644
--- a/libparted/unit.c
+++ b/libparted/unit.c
@@ -112,7 +112,7 @@ ped_unit_get_default ()
  * Get the byte size of a given \p unit.
  */
 long long
-ped_unit_get_size (PedDevice* dev, PedUnit unit)
+ped_unit_get_size (const PedDevice* dev, PedUnit unit)
 {
 	PedSector cyl_size = dev->bios_geom.heads * dev->bios_geom.sectors;

@@ -192,7 +192,7 @@ ped_strdup (const char *str)
  * The returned string must be freed with ped_free().
  */
 char*
-ped_unit_format_custom_byte (PedDevice* dev, PedSector byte, PedUnit unit)
+ped_unit_format_custom_byte (const PedDevice* dev, PedSector byte, PedUnit unit)
 {
 	char buf[100];
 	PedSector sector = byte / dev->sector_size;
@@ -203,7 +203,7 @@ ped_unit_format_custom_byte (PedDevice* dev, PedSector byte, PedUnit unit)
 	
 	/* CHS has a special comma-separated format. */
 	if (unit == PED_UNIT_CHS) {
-		PedCHSGeometry *chs = &dev->bios_geom;
+		const PedCHSGeometry *chs = &dev->bios_geom;
 		snprintf (buf, 100, "%lld,%lld,%lld",
 			  sector / chs->sectors / chs->heads,
 			  (sector / chs->sectors) % chs->heads,
@@ -265,7 +265,7 @@ ped_unit_format_custom_byte (PedDevice* dev, PedSector byte, PedUnit unit)
  * The returned string must be freed with ped_free().
  */
 char*
-ped_unit_format_byte (PedDevice* dev, PedSector byte)
+ped_unit_format_byte (const PedDevice* dev, PedSector byte)
 {
 	PED_ASSERT (dev != NULL, return NULL);
 	return ped_unit_format_custom_byte (dev, byte, default_unit);
@@ -278,7 +278,7 @@ ped_unit_format_byte (PedDevice* dev, PedSector byte)
  * The returned string must be freed with ped_free().
  */
 char*
-ped_unit_format_custom (PedDevice* dev, PedSector sector, PedUnit unit)
+ped_unit_format_custom (const PedDevice* dev, PedSector sector, PedUnit unit)
 {
 	PED_ASSERT (dev != NULL, return NULL);
 	return ped_unit_format_custom_byte(dev, sector*dev->sector_size, unit);
@@ -292,7 +292,7 @@ ped_unit_format_custom (PedDevice* dev, PedSector sector, PedUnit unit)
  * The returned string must be freed with ped_free().
  */
 char*
-ped_unit_format (PedDevice* dev, PedSector sector)
+ped_unit_format (const PedDevice* dev, PedSector sector)
 {
 	PED_ASSERT (dev != NULL, return NULL);
 	return ped_unit_format_custom_byte (dev, sector * dev->sector_size,
@@ -311,7 +311,7 @@ ped_unit_format (PedDevice* dev, PedSector sector)
  * \return \c 1 if \p str is a valid location description, \c 0 otherwise
  */
 int
-ped_unit_parse (const char* str, PedDevice* dev, PedSector *sector,
+ped_unit_parse (const char* str, const PedDevice* dev, PedSector *sector,
 		PedGeometry** range)
 {
 	return ped_unit_parse_custom (str, dev, default_unit, sector, range);
@@ -336,11 +336,11 @@ strip_string (char* str)
 /* Find non-number suffix.  Eg: find_suffix("32Mb") returns a pointer to
  * "Mb". */
 static char*
-find_suffix (char* str)
+find_suffix (const char* str)
 {
 	while (str[0] != 0 && (isdigit (str[0]) || strchr(",.-", str[0])))
 		str++;
-	return str;
+	return (char *) str;
 }

 static void
@@ -366,7 +366,7 @@ is_chs (const char* str)
 }

 static int
-parse_chs (const char* str, PedDevice* dev, PedSector* sector,
+parse_chs (const char* str, const PedDevice* dev, PedSector* sector,
 		PedGeometry** range)
 {
 	PedSector cyl_size = dev->bios_geom.heads * dev->bios_geom.sectors;
@@ -429,7 +429,7 @@ error_free_copy:
 }

 static PedSector
-clip (PedDevice* dev, PedSector sector)
+clip (const PedDevice* dev, PedSector sector)
 {
 	if (sector < 0)
 		return 0;
@@ -439,7 +439,8 @@ clip (PedDevice* dev, PedSector sector)
 }

 static PedGeometry*
-geometry_from_centre_radius (PedDevice* dev, PedSector sector, PedSector radius)
+geometry_from_centre_radius (const PedDevice* dev,
+                             PedSector sector, PedSector radius)
 {
 	PedSector start = clip (dev, sector - radius);
 	PedSector end = clip (dev, sector + radius);
@@ -498,7 +499,7 @@ parse_unit_suffix (const char* suffix, PedUnit suggested_unit)
  * \return \c 1 if \p str is a valid location description, \c 0 otherwise.
  */
 int
-ped_unit_parse_custom (const char* str, PedDevice* dev, PedUnit unit,
+ped_unit_parse_custom (const char* str, const PedDevice* dev, PedUnit unit,
 		       PedSector* sector, PedGeometry** range)
 {
 	char*     copy;