From adf20c0c4d9f488d55254f54a79079b9cacbde8d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 7 Aug 2009 09:38:37 +0200
Subject: adjust const "**" pointers to avoid warnings

Also, ...
* src/generator.ml: Add DeviceList type, and propagate that change
out to all calling/interface code.
---
 daemon/sfdisk.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'daemon/sfdisk.c')

diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index 8a5a46b0..6d49387a 100644
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -32,7 +32,7 @@
 static int
 sfdisk (const char *device, int n, int cyls, int heads, int sectors,
         const char *extra_flag,
-        char * const* const lines)
+        char *const *lines)
 {
   FILE *fp;
   char buf[256];
@@ -96,7 +96,7 @@ sfdisk (const char *device, int n, int cyls, int heads, int sectors,
 
 int
 do_sfdisk (const char *device, int cyls, int heads, int sectors,
-           char **lines)
+           char *const *lines)
 {
   return sfdisk (device, 0, cyls, heads, sectors, NULL, lines);
 }
@@ -105,13 +105,13 @@ int
 do_sfdisk_N (const char *device, int n, int cyls, int heads, int sectors,
              const char *line)
 {
-  const char *lines[2] = { line, NULL };
+  char const *const lines[2] = { line, NULL };
 
-  return sfdisk (device, n, cyls, heads, sectors, NULL, lines);
+  return sfdisk (device, n, cyls, heads, sectors, NULL, (void *) lines);
 }
 
 int
-do_sfdiskM (const char *device, char **lines)
+do_sfdiskM (const char *device, char *const *lines)
 {
   return sfdisk (device, 0, 0, 0, 0, "-uM", lines);
 }
-- 
cgit