diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-20 14:55:32 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-20 08:12:03 +0200 |
| commit | a1f04e8abc761ef1ba211420ff1dbda50fcf527d (patch) | |
| tree | 77f452c87c7e859341728e2835bd7493b6d8c9c7 /libcli/util | |
| parent | 018f4a5889743f742a59e9ad72056b2ea09adfe9 (diff) | |
| download | samba-a1f04e8abc761ef1ba211420ff1dbda50fcf527d.tar.gz samba-a1f04e8abc761ef1ba211420ff1dbda50fcf527d.tar.bz2 samba-a1f04e8abc761ef1ba211420ff1dbda50fcf527d.zip | |
libcli/util Rename common map_nt_error_from_unix to avoid duplicate symbol
The two error tables need to be combined, but for now seperate the names.
(As the common parts of the tree now use the _common function,
errmap_unix.c must be included in the s3 autoconf build).
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Jun 20 08:12:03 CEST 2011 on sn-devel-104
Diffstat (limited to 'libcli/util')
| -rw-r--r-- | libcli/util/errmap_unix.c | 2 | ||||
| -rw-r--r-- | libcli/util/error.h | 2 | ||||
| -rw-r--r-- | libcli/util/tstream.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libcli/util/errmap_unix.c b/libcli/util/errmap_unix.c index 75b1e8d2fe..8f9f89835e 100644 --- a/libcli/util/errmap_unix.c +++ b/libcli/util/errmap_unix.c @@ -140,7 +140,7 @@ static const struct { /********************************************************************* Map an NT error code from a Unix error code. *********************************************************************/ -NTSTATUS map_nt_error_from_unix(int unix_error) +NTSTATUS map_nt_error_from_unix_common(int unix_error) { int i; diff --git a/libcli/util/error.h b/libcli/util/error.h index 771d7a661e..5c4dc10916 100644 --- a/libcli/util/error.h +++ b/libcli/util/error.h @@ -41,7 +41,7 @@ WERROR ntstatus_to_werror(NTSTATUS error); /********************************************************************* Map an NT error code from a Unix error code. *********************************************************************/ -NTSTATUS map_nt_error_from_unix(int unix_error); +NTSTATUS map_nt_error_from_unix_common(int unix_error); NTSTATUS nt_status_squash(NTSTATUS nt_status); diff --git a/libcli/util/tstream.c b/libcli/util/tstream.c index b287597c62..12cef9b6dd 100644 --- a/libcli/util/tstream.c +++ b/libcli/util/tstream.c @@ -106,7 +106,7 @@ static void tstream_read_pdu_blob_done(struct tevent_req *subreq) ret = tstream_readv_recv(subreq, &sys_errno); TALLOC_FREE(subreq); if (ret == -1) { - status = map_nt_error_from_unix(sys_errno); + status = map_nt_error_from_unix_common(sys_errno); tevent_req_nterror(req, status); return; } |