lib/expat: use C++ exceptions instead of class Error

src/lib/upnp/ContentDirectoryService.hxx

@@ -76,17 +76,14 @@ public:
 	/** Read a container's children list into dirbuf.
 	 *
 	 * @param objectId the UPnP object Id for the container. Root has Id "0"
-	 * @param[out] dirbuf stores the entries we read.
 	 */
-	bool readDir(UpnpClient_Handle handle,
-		     const char *objectId, UPnPDirContent &dirbuf,
-		     Error &error) const;
+	UPnPDirContent readDir(UpnpClient_Handle handle,
+			       const char *objectId) const;
 
-	bool readDirSlice(UpnpClient_Handle handle,
+	void readDirSlice(UpnpClient_Handle handle,
 			  const char *objectId, unsigned offset,
 			  unsigned count, UPnPDirContent& dirbuf,
-			  unsigned &didread, unsigned &total,
-			  Error &error) const;
+			  unsigned &didread, unsigned &total) const;
 
 	/** Search the content directory service.
 	 *
@@ -96,22 +93,17 @@ public:
 	 * @param searchstring an UPnP searchcriteria string. Check the
 	 * UPnP document: UPnP-av-ContentDirectory-v1-Service-20020625.pdf
 	 * section 2.5.5. Maybe we'll provide an easier way some day...
-	 * @param[out] dirbuf stores the entries we read.
 	 */
-	bool search(UpnpClient_Handle handle,
-		    const char *objectId, const char *searchstring,
-		    UPnPDirContent &dirbuf,
-		    Error &error) const;
+	UPnPDirContent search(UpnpClient_Handle handle,
+			      const char *objectId,
+			      const char *searchstring) const;
 
 	/** Read metadata for a given node.
 	 *
 	 * @param objectId the UPnP object Id. Root has Id "0"
-	 * @param[out] dirbuf stores the entries we read. At most one entry will be
-	 *   returned.
 	 */
-	bool getMetadata(UpnpClient_Handle handle,
-			 const char *objectId, UPnPDirContent &dirbuf,
-			 Error &error) const;
+	UPnPDirContent getMetadata(UpnpClient_Handle handle,
+				   const char *objectId) const;
 
 	/** Retrieve search capabilities
 	 *