From 01d17e5c4b341172b6cb8c8d78ecf198dcdd94ba Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Mon, 15 Mar 2010 23:39:48 +0000 Subject: [PATCH] Backport of svn revision 495: * SF Patch Tracker [ 2970872 ] Update ErrorMessages for latest return code list Submitted By: Nick Leverton ( leveret ) ErrorMessage[] in upnptools.c has got a bit out of sync, the attached patch (generated from grep 'define UPNP_E_') should bring it up to date. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@496 119443c7-1b9e-41f8-b6fc-b9c35fce742c --- ChangeLog | 8 ++++++++ upnp/src/api/upnptools.c | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc7a8ad..11951ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ Version 1.6.7 ******************************************************************************* +2010-03-15 Marcelo Jimenez + * SF Patch Tracker [ 2970872 ] Update ErrorMessages for latest return + code list + Submitted By: Nick Leverton ( leveret ) + + ErrorMessage[] in upnptools.c has got a bit out of sync, the attached + patch (generated from grep 'define UPNP_E_') should bring it up to date. + 2010-03-15 Marcelo Jimenez * SF Patch Tracker [ 2857611 ] Declare a few functions to have proper (void) argument list. diff --git a/upnp/src/api/upnptools.c b/upnp/src/api/upnptools.c index 2311140..2becc1b 100644 --- a/upnp/src/api/upnptools.c +++ b/upnp/src/api/upnptools.c @@ -77,7 +77,7 @@ struct ErrorString ErrorMessages[] = { {UPNP_E_INVALID_PARAM, "UPNP_E_INVALID_PARAM"}, {UPNP_E_OUTOF_HANDLE, "UPNP_E_OUTOF_HANDLE"}, {UPNP_E_OUTOF_CONTEXT, "UPNP_E_OUTOF_CONTEXT"}, - {UPNP_E_OUTOF_MEMORY, "UPNP_E_OUTOF_MEMOR"}, + {UPNP_E_OUTOF_MEMORY, "UPNP_E_OUTOF_MEMORY"}, {UPNP_E_INIT, "UPNP_E_INIT"}, {UPNP_E_BUFFER_TOO_SMALL, "UPNP_E_BUFFER_TOO_SMALL"}, {UPNP_E_INVALID_DESC, "UPNP_E_INVALID_DESC"}, @@ -90,7 +90,10 @@ struct ErrorString ErrorMessages[] = { {UPNP_E_INVALID_ACTION, "UPNP_E_INVALID_ACTION"}, {UPNP_E_FINISH, "UPNP_E_FINISH"}, {UPNP_E_INIT_FAILED, "UPNP_E_INIT_FAILED"}, + {UPNP_E_URL_TOO_BIG, "UPNP_E_URL_TOO_BIG"}, {UPNP_E_BAD_HTTPMSG, "UPNP_E_BAD_HTTPMSG"}, + {UPNP_E_ALREADY_REGISTERED, "UPNP_E_ALREADY_REGISTERED"}, + {UPNP_E_INVALID_INTERFACE, "UPNP_E_INVALID_INTERFACE"}, {UPNP_E_NETWORK_ERROR, "UPNP_E_NETWORK_ERROR"}, {UPNP_E_SOCKET_WRITE, "UPNP_E_SOCKET_WRITE"}, {UPNP_E_SOCKET_READ, "UPNP_E_SOCKET_READ"}, @@ -98,13 +101,22 @@ struct ErrorString ErrorMessages[] = { {UPNP_E_SOCKET_CONNECT, "UPNP_E_SOCKET_CONNECT"}, {UPNP_E_OUTOF_SOCKET, "UPNP_E_OUTOF_SOCKET"}, {UPNP_E_LISTEN, "UPNP_E_LISTEN"}, + {UPNP_E_TIMEDOUT, "UPNP_E_TIMEDOUT"}, + {UPNP_E_SOCKET_ERROR, "UPNP_E_SOCKET_ERROR"}, + {UPNP_E_FILE_WRITE_ERROR, "UPNP_E_FILE_WRITE_ERROR"}, + {UPNP_E_CANCELED, "UPNP_E_CANCELED"}, {UPNP_E_EVENT_PROTOCOL, "UPNP_E_EVENT_PROTOCOL"}, {UPNP_E_SUBSCRIBE_UNACCEPTED, "UPNP_E_SUBSCRIBE_UNACCEPTED"}, {UPNP_E_UNSUBSCRIBE_UNACCEPTED, "UPNP_E_UNSUBSCRIBE_UNACCEPTED"}, {UPNP_E_NOTIFY_UNACCEPTED, "UPNP_E_NOTIFY_UNACCEPTED"}, - {UPNP_E_INTERNAL_ERROR, "UPNP_E_INTERNAL_ERROR"}, {UPNP_E_INVALID_ARGUMENT, "UPNP_E_INVALID_ARGUMENT"}, + {UPNP_E_FILE_NOT_FOUND, "UPNP_E_FILE_NOT_FOUND"}, + {UPNP_E_FILE_READ_ERROR, "UPNP_E_FILE_READ_ERROR"}, + {UPNP_E_EXT_NOT_XML, "UPNP_E_EXT_NOT_XML"}, + {UPNP_E_NO_WEB_SERVER, "UPNP_E_NO_WEB_SERVER"}, {UPNP_E_OUTOF_BOUNDS, "UPNP_E_OUTOF_BOUNDS"}, + {UPNP_E_NOT_FOUND, "UPNP_E_NOT_FOUND"}, + {UPNP_E_INTERNAL_ERROR, "UPNP_E_INTERNAL_ERROR"}, };