DistRen Changeset - c27e5bb830d1 · protofusion repositories

Changeset - c27e5bb830d1

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 16 years ago 2009-08-16 18:26:22
ohnobinki@ohnopublishing.net

xml_quickxpath(): fixed error handling, updated header

2 files changed with 8 insertions and 3 deletions:

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -45,13 +45,14 @@ @@
 xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path)
+{
   xmlNodePtr toreturn;
   xmlXPathObjectPtr xmlxpathobjptr;
   xmlxpathobjptr = xmlXPathEval(path, xpathctxt);
   if(!xmlxpathobjptr->nodesetval->nodeNr)
   if(!xmlxpathobjptr
      || !xmlxpathobjptr->nodesetval->nodeNr)
+    {
       fprintf(stderr, "XPath resolution failed for ``%s'' in ``%s'' (``%s'')\n", path, xpathctxt->doc->name, xpathctxt->doc->URL);
       return (xmlNodePtr)NULL;
+    }
   toreturn = *(xmlxpathobjptr->nodesetval->nodeTab);

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -16,22 +16,26 @@ @@
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef _DISTREN_SLAVEFUNCS_H
 #define _DISTREN_SLAVEFUNCS_H
 #include "blendjob.h"
 #include <libxml/xpath.h>
 #include <stdio.h>
-int buildstruct(struct blendjob* blendjob, char *pathtoxml);
+xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path);
 void tell_the_server(char *stuff);
 size_t curl_writetodisk(void *ptr, size_t size, size_t nmemb, FILE *stream);
 int curlget(char *url, char *out);
 int curlpost(char *filename, char *url);
 int ssh_keygen();
 int register_user(char *username, char *email);
 int login_user(char *username);
 int conf_replace(char *username);
 void exec_blender(struct blendjob* blendjob, char *input, char *output, char *outputres, int frame);
 void xmlinit();
 void xmlcleanup();
 #endif

0 comments (0 inline, 0 general)