diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-11 23:00:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:04 -0500 |
| commit | 39f1f55610594c4b82c4b0f1ec7c9611b2f3f8a4 (patch) | |
| tree | 2109ddb86684b0790b2f9b76c1a67f7c81b3ece7 /source4 | |
| parent | be6c9f9a4ea557f5415070fc27772a3d25b57a60 (diff) | |
| download | samba-39f1f55610594c4b82c4b0f1ec7c9611b2f3f8a4.tar.gz samba-39f1f55610594c4b82c4b0f1ec7c9611b2f3f8a4.tar.bz2 samba-39f1f55610594c4b82c4b0f1ec7c9611b2f3f8a4.zip | |
r14215: Improve warning/error messages.
(This used to be commit 80b9865b373ee542da2d56d6688b4c8fd4c6275c)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba3/Client.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba3/Header.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm | 2 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba3/Types.pm | 12 |
4 files changed, 14 insertions, 8 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Client.pm index ceeb81c3d7..59f0341d02 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba3/Client.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba3/Client.pm @@ -19,8 +19,8 @@ my $tabs = ""; sub indent() { $tabs.="\t"; } sub deindent() { $tabs = substr($tabs, 1); } sub pidl($) { $res .= $tabs.(shift)."\n"; } -sub fatal($$) { my ($e,$s) = @_; die("$e->{FILE}:$e->{LINE}: $s\n"); } -sub warning($$) { my ($e,$s) = @_; warn("$e->{FILE}:$e->{LINE}: $s\n"); } +sub fatal($$) { my ($e,$s) = @_; die("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); } +sub warning($$) { my ($e,$s) = @_; warn("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); } sub CopyLevel($$$$) { diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Header.pm index fb02120a42..480a6c8e44 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba3/Header.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba3/Header.pm @@ -19,8 +19,8 @@ my $tabs = ""; sub indent() { $tabs.="\t"; } sub deindent() { $tabs = substr($tabs, 1); } sub pidl($) { $res .= $tabs.(shift)."\n"; } -sub fatal($$) { my ($e,$s) = @_; die("$e->{FILE}:$e->{LINE}: $s\n"); } -sub warning($$) { my ($e,$s) = @_; warn("$e->{FILE}:$e->{LINE}: $s\n"); } +sub fatal($$) { my ($e,$s) = @_; die("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); } +sub warning($$) { my ($e,$s) = @_; warn("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); } sub ParseElement($) { diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm index c12f7554e9..a6b4b38cdf 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm @@ -22,7 +22,7 @@ my $tabs = ""; sub indent() { $tabs.="\t"; } sub deindent() { $tabs = substr($tabs, 1); } sub pidl($) { $res .= $tabs.(shift)."\n"; } -sub fatal($$) { my ($e,$s) = @_; die("$e->{FILE}:$e->{LINE}: $s\n"); } +sub fatal($$) { my ($e,$s) = @_; die("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); } #TODO: # - Add some security checks (array sizes, memory alloc == NULL, etc) diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Types.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Types.pm index d1f1032714..c31f406a38 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba3/Types.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba3/Types.pm @@ -18,7 +18,7 @@ $VERSION = '0.01'; # TODO: Find external types somehow? -sub warning($$) { my ($e,$s) = @_; print STDERR "$e->{FILE}:$e->{LINE}: $s\n"; } +sub warning($$) { my ($e,$s) = @_; print STDERR "$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"; } sub init_scalar($$$$) { @@ -144,6 +144,12 @@ my $known_types = INIT => \&init_scalar, DISSECT_P => \&dissect_scalar, }, + int32 => + { + DECL => "int32", + INIT => \&init_scalar, + DISSECT_P => \&dissect_scalar, + }, string => { DECL => \&decl_string, @@ -228,7 +234,7 @@ sub DeclShort($) my $t = $known_types->{$e->{TYPE}}; if (not $t) { - warning($e, "Can't declare unknown type $e->{TYPE}"); + warning($e, "Can't declare unknown type `$e->{TYPE}'"); return undef; } @@ -262,7 +268,7 @@ sub DeclLong($) my $t = $known_types->{$e->{TYPE}}; if (not $t) { - warning($e, "Can't declare unknown type $e->{TYPE}"); + warning($e, "Can't declare unknown type `$e->{TYPE}'"); return undef; } |