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];
fp = popen (buf, "w");
if (fp == NULL) {
- reply_with_perror (buf);
+ reply_with_perror ("failed to open pipe: %s", buf);
return -1;
}
for (i = 0; lines[i] != NULL; ++i) {
if (fprintf (fp, "%s\n", lines[i]) < 0) {
- reply_with_perror (buf);
+ reply_with_perror ("failed to write to pipe: %s", buf);
pclose (fp);
return -1;
}
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);
}
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);
}
r = command (&out, &err, "/sbin/sfdisk", flag, device, NULL);
if (r == -1) {
- reply_with_error ("sfdisk: %s: %s", device, err);
+ reply_with_error ("%s: %s", device, err);
free (out);
free (err);
return NULL;