[Pkg-gnupg-commit] [libassuan] 307/437: typo fixes and fix w32ce message formatting

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit e68c68f6906057b15563ca08ec62cb4188bca39e
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 30 18:54:03 2010 +0000

    typo fixes and fix w32ce message formatting
---
 src/ChangeLog      | 4 ++++
 src/assuan-error.c | 6 +++++-
 src/gpgcedev.c     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index d8b1521..534ba65 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-23  Werner Koch  <wk at g10code.com>
+
+	* assuan-error.c (_assuan_w32_strerror) [W32CE]: Print only the code.
+
 2010-03-22  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (mkheader, assuan.h): Build header file.
diff --git a/src/assuan-error.c b/src/assuan-error.c
index c45ca67..cc1ff5c 100644
--- a/src/assuan-error.c
+++ b/src/assuan-error.c
@@ -53,10 +53,14 @@ _assuan_w32_strerror (assuan_context_t ctx, int ec)
 {
   if (ec == -1)
     ec = (int)GetLastError ();
+#ifdef HAVE_W32CE_SYSTEM
+  snprintf (ctx->w32_strerror, sizeof (ctx->w32_strerror) - 1,
+            "ec=%d", (int)GetLastError ());
+#else
   FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, ec,
                  MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
                  ctx->w32_strerror, sizeof (ctx->w32_strerror) - 1, NULL);
-
+#endif
   return ctx->w32_strerror;
 }
 #endif
diff --git a/src/gpgcedev.c b/src/gpgcedev.c
index fe9c80a..8508474 100644
--- a/src/gpgcedev.c
+++ b/src/gpgcedev.c
@@ -48,7 +48,7 @@
    The caller sends this IOCTL to the read or the write handle.  The
    required inbuf parameter is address of a variable holding the
    rendezvous id of the pipe's other end.  There is one possible
-   problem with eocdde: If a pipe is kept in non-rendezvous state
+   problem with the code: If a pipe is kept in non-rendezvous state
    until after the rendezvous ids overflow, it is possible that the
    wrong end will be used.  However this is not a realistic scenario.  */
 #define GPGCEDEV_IOCTL_MAKE_PIPE \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git