[syslinux:master] disk: Fixing get_error() call

syslinux-bot for Erwan Velu erwanaliasr1 at gmail.com
Wed May 12 15:00:36 PDT 2010


Commit-ID:  9d193b67979bae7feaf62186f8dc6d989c085ba6
Gitweb:     http://syslinux.zytor.com/commit/9d193b67979bae7feaf62186f8dc6d989c085ba6
Author:     Erwan Velu <erwanaliasr1 at gmail.com>
AuthorDate: Wed, 12 May 2010 21:10:47 +0200
Committer:  H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Wed, 12 May 2010 14:57:03 -0700

disk: Fixing get_error() call

get_error prototype changed since this module was written


---
 com32/modules/disk.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/com32/modules/disk.c b/com32/modules/disk.c
index 62914f4..db7f93c 100644
--- a/com32/modules/disk.c
+++ b/com32/modules/disk.c
@@ -16,11 +16,12 @@
 #include <string.h>
 #include <disk/geom.h>
 #include <disk/util.h>
+#include <disk/errno_disk.h>
+#include <disk/error.h>
 
 int main(int argc __attribute__ (( unused )),
 	 char *argv[] __attribute__ (( unused )))
 {
-	char* error_buffer;
 	int err;
 	struct driveinfo drive;
 	struct driveinfo *d = &drive;
@@ -30,17 +31,14 @@ int main(int argc __attribute__ (( unused )),
 	for (int disk = 0x80; disk < 0xff; disk++) {
 		memset(d, 0, sizeof(struct driveinfo));
 		d->disk = disk;
-		err = get_drive_parameters(d);
+		get_drive_parameters(d);
 
 		/* Do not print output when drive does not exists */
-		if (err == -1 || !d->cbios)
+		if (errno_disk == -1 || !d->cbios)
 			continue;
 
-		if (err) {
-			get_error(err, &error_buffer);
-			printf("Error 0x%Xh while reading disk 0x%X:\n  %s\n",
-					err, d->disk, error_buffer);
-			free(error_buffer);
+		if (errno_disk) {
+			get_error("reading disk");
 			continue;
 		}
 



More information about the Syslinux-commits mailing list