Mercurial > pidgin
comparison libpurple/xmlnode.h @ 26689:8a77e6cd7eac
merge of 'ac3524a1092f2874db1b7f443cd91144bbd8a3a4'
and 'bcb04d16f3ca4e36afd84bde4ebe44396dc6c2b3'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 26 Apr 2009 02:18:03 +0000 |
parents | 872d30754311 |
children | 350f097019eb |
comparison
equal
deleted
inserted
replaced
26654:4a3a0c47dfe1 | 26689:8a77e6cd7eac |
---|---|
333 /** | 333 /** |
334 * Creates a node from a XML File. Calling this on the | 334 * Creates a node from a XML File. Calling this on the |
335 * root node of an XML document will parse the entire document | 335 * root node of an XML document will parse the entire document |
336 * into a tree of nodes, and return the xmlnode of the root. | 336 * into a tree of nodes, and return the xmlnode of the root. |
337 * | 337 * |
338 * @param str The string of xml. | 338 * @param dir The directory where the file is located |
339 * @param description The description of the file being parsed | 339 * @param filename The filename |
340 * @process The utility that is calling xmlnode_from_file | 340 * @param description A description of the file being parsed. Displayed to |
341 * | 341 * the user if the file cannot be read. |
342 * @return The new node. | 342 * @param process The subsystem that is calling xmlnode_from_file. Used as |
343 * the category for debugging. | |
344 * | |
345 * @return The new node or NULL if an error occurred. | |
343 * | 346 * |
344 * @since 2.6.0 | 347 * @since 2.6.0 |
345 */ | 348 */ |
346 xmlnode *xmlnode_from_file(const char *dir, const char *filename, | 349 xmlnode *xmlnode_from_file(const char *dir, const char *filename, |
347 const char *description, const char *process); | 350 const char *description, const char *process); |