From b7147b1b9bf75e3006792a1d9da3f15ea0859167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sat, 17 Apr 1999 15:55:27 +0200
Subject: [PATCH] Improved some error messages.
Rev: src/modules/files/file.c:1.147
---
src/modules/files/file.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index f0af7bace8..3b2fba9e14 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -5,7 +5,7 @@
\*/
/**/
#include "global.h"
-RCSID("$Id: file.c,v 1.146 1999/04/13 22:23:20 hubbe Exp $");
+RCSID("$Id: file.c,v 1.147 1999/04/17 13:55:27 grubba Exp $");
#include "fdlib.h"
#include "interpret.h"
#include "svalue.h"
@@ -876,7 +876,9 @@ static void file_write(INT32 args)
struct pike_string *str;
if(args<1 || ((sp[-args].type != T_STRING) && (sp[-args].type != T_ARRAY)))
- error("Bad argument 1 to file->write().\n");
+ error("Bad argument 1 to file->write().\n"
+ "Type is %s. Expected string or array(string)\n",
+ type_name[sp[-args].type]);
if(FD < 0)
error("File not open for write.\n");
@@ -885,8 +887,14 @@ static void file_write(INT32 args)
struct array *a = sp[-args].u.array;
i = a->size;
while(i--) {
- if ((a->item[i].type != T_STRING) || (a->item[i].u.string->size_shift)) {
- error("Bad argument 1 to file->write().\n");
+ if (a->item[i].type != T_STRING) {
+ error("Bad argument 1 to file->write().\n"
+ "Element %d is not a string.\n",
+ i);
+ } else if (a->item[i].u.string->size_shift) {
+ error("Bad argument 1 to file->write().\n"
+ "Element %d is a wide string.\n",
+ i);
}
}
--
GitLab