Merge pull request #1 from jsuchome/Code-11-SP3

check the return value of error handling function
yast · Feb 14, 2013 · 2f0f8fa · 2f0f8fa
2 parents 4d07e40 + 9864684
commit 2f0f8fa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.16.0
+2.17.0
diff --git a/agent-slp/src/SlpAgent.cc b/agent-slp/src/SlpAgent.cc
@@ -168,7 +168,11 @@ MySLPSrvURLCallback (SLPHandle hslp,
     switch(errcode) {
         case SLP_OK:
             err = SLPParseSrvURL(srvurl, &parsedurl);
-            check_error_state(err, "Error parsing SrvURL");
+
+            if (!check_error_state(err, "Error parsing SrvURL")->value())
+            {
+              break;
+            }
 
             entry->add(YCPString("srvurl"), YCPString(srvurl) );
             entry->add(YCPString("pcSrvType"), YCPString(parsedurl->s_pcSrvType) );

diff --git a/package/yast2-slp.changes b/package/yast2-slp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 14 13:03:49 CET 2013 - jsuchome@suse.cz
+
+- check the return value of error handling function
+- 2.17.0 
+
 -------------------------------------------------------------------
 Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz