Merge pull request #4314 from MartijnKaijser/beta1
[vuplus_xbmc] / lib / libUPnP / patches / 0002-UPnP-Platinum-log-allowed-values-with-state-variable.patch
1 From 58d8b1df5f6c631bd43c1bcda810a786c23de9ac Mon Sep 17 00:00:00 2001
2 From: Alasdair Campbell <alcoheca@gmail.com>
3 Date: Wed, 6 Jun 2012 17:04:31 +0100
4 Subject: [PATCH 02/21] [UPnP] Platinum - log allowed values with state
5  variable errors
6
7 ---
8  lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp | 14 +++++++++-----
9  1 file changed, 9 insertions(+), 5 deletions(-)
10
11 diff --git a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
12 index 5dd2d61..229e304 100644
13 --- a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
14 +++ b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
15 @@ -197,12 +197,16 @@ PLT_StateVariable::ValidateValue(const char* value)
16              NPT_List<NPT_String>::Iterator val = values.GetFirstItem();
17              while (val) {
18                  val->Trim(" ");
19 -                               if (!m_AllowedValues.Find(NPT_StringFinder(*val))) {
20 -                                       NPT_LOG_WARNING_2("Invalid value of %s for state variable %s", 
21 -                                               (const char*)*val,
22 -                                               (const char*)m_Name);
23 +                if (!m_AllowedValues.Find(NPT_StringFinder(*val))) {
24 +                    NPT_LOG_WARNING_2("Invalid value of %s for state variable %s",
25 +                        (const char*)*val,
26 +                        (const char*)m_Name);
27 +                    for (unsigned long i=0; i < m_AllowedValues.GetItemCount(); i++) {
28 +                        NPT_String *val = *m_AllowedValues.GetItem(i);
29 +                        NPT_LOG_WARNING_1("Allowed: %s", (const char*)*val);
30 +                    }
31                      return NPT_ERROR_INVALID_PARAMETERS;
32 -                               }
33 +                }
34                  ++val;
35              }
36          }
37 -- 
38 1.7.11.msysgit.0
39