From 01c01f07d5e697352f8d748976b224da0026349c Mon Sep 17 00:00:00 2001 From: ketmar Date: Sat, 14 Sep 2013 08:16:03 +0300 Subject: [PATCH] jam_xml.*: cosmetix --- src/jam_xml.c | 24 ++++++++++-------- src/jam_xml.h | 80 ++++++++++++++++++++++++++++------------------------------- 2 files changed, 52 insertions(+), 52 deletions(-) rewrite src/jam_xml.h (78%) diff --git a/src/jam_xml.c b/src/jam_xml.c index 8436b1c..4e2d809 100644 --- a/src/jam_xml.c +++ b/src/jam_xml.c @@ -1,14 +1,12 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - #include #include "jam_xml.h" -char *jam_xmlGetString(xmlDocPtr doc, xmlNodePtr node) { + +char *jam_xmlGetString (xmlDocPtr doc, xmlNodePtr node) { /* we can't guarantee that xmlFree and g_free do the same thing, * so we must copy this string into a glib-allocated string. */ xmlChar *str = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE); @@ -17,7 +15,8 @@ char *jam_xmlGetString(xmlDocPtr doc, xmlNodePtr node) { return ret; } -guint32 jam_xmlGetUInt32(xmlDocPtr doc, xmlNodePtr node) { + +guint32 jam_xmlGetUInt32 (xmlDocPtr doc, xmlNodePtr node) { guint32 ret = 0; xmlChar *value = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE); if (value) { @@ -27,7 +26,8 @@ guint32 jam_xmlGetUInt32(xmlDocPtr doc, xmlNodePtr node) { return ret; } -gboolean jam_xmlGetInt(xmlDocPtr doc, xmlNodePtr node, int *ret) { + +gboolean jam_xmlGetInt (xmlDocPtr doc, xmlNodePtr node, int *ret) { xmlChar *value = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE); if (value) { *ret = atoi((char *)value); @@ -37,25 +37,29 @@ gboolean jam_xmlGetInt(xmlDocPtr doc, xmlNodePtr node, int *ret) { return FALSE; } -xmlNodePtr jam_xmlAddInt(xmlNodePtr node, char *name, int val) { + +xmlNodePtr jam_xmlAddInt (xmlNodePtr node, char *name, int val) { char buf[20]; sprintf(buf, "%d", val); return xmlNewTextChild(node, NULL, BAD_CAST name, BAD_CAST buf); } -void jam_xmlNewDoc(xmlDocPtr *doc, xmlNodePtr *node, char *name) { + +void jam_xmlNewDoc (xmlDocPtr *doc, xmlNodePtr *node, char *name) { *doc = xmlNewDoc(BAD_CAST "1.0"); *node = xmlNewDocNode(*doc, NULL, BAD_CAST name, NULL); xmlDocSetRootElement(*doc, *node); } -void jam_xmlSetIntProp(xmlNodePtr node, const char *name, int value) { + +void jam_xmlSetIntProp (xmlNodePtr node, const char *name, int value) { char buf[20]; g_snprintf(buf, 20, "%d", value); xmlSetProp(node, BAD_CAST name, BAD_CAST buf); } -gboolean jam_xmlGetIntProp(xmlNodePtr node, const char *name, int *value) { + +gboolean jam_xmlGetIntProp (xmlNodePtr node, const char *name, int *value) { xmlChar *prop; prop = xmlGetProp(node, BAD_CAST name); if (prop) { diff --git a/src/jam_xml.h b/src/jam_xml.h dissimilarity index 78% index 1312dc1..4d1e60d 100644 --- a/src/jam_xml.h +++ b/src/jam_xml.h @@ -1,42 +1,38 @@ -/* logjam - a GTK client for LiveJournal. - * Copyright (C) 2000-2003 Evan Martin - */ -#ifndef __LOGJAM_XML_H__ -#define __LOGJAM_XML_H__ - -#include - -void jam_xmlNewDoc(xmlDocPtr *doc, xmlNodePtr *node, char *name); - -char *jam_xmlGetString(xmlDocPtr doc, xmlNodePtr node); -guint32 jam_xmlGetUInt32(xmlDocPtr doc, xmlNodePtr node); -gboolean jam_xmlGetInt(xmlDocPtr doc, xmlNodePtr node, int *value); - -xmlNodePtr jam_xmlAddInt(xmlNodePtr node, char *name, int val); - -void jam_xmlSetIntProp(xmlNodePtr node, const char *name, int value); -gboolean jam_xmlGetIntProp(xmlNodePtr node, const char *name, int *value); - -/* from conf_xml.c - * - * basically, these XML_* functions run a series of ifs on the node name. - * be sure to end with XML_GET_END, which prints error information if a node - * wasn't handled. - */ -#define XML_GET_IF(key, what) \ -if (xmlStrcmp(node->name, BAD_CAST key) == 0) {\ - what \ -} else -#define XML_GET_FUNC(key, dest, func) XML_GET_IF(key, dest = func(doc, node);) -#define XML_GET_STR(key, dest) XML_GET_FUNC(key, dest, jam_xmlGetString) -#define XML_GET_UINT32(key, dest) XML_GET_FUNC(key, dest, jam_xmlGetUInt32) -#define XML_GET_INT(key, dest) XML_GET_IF(key, jam_xmlGetInt(doc, node, &dest);) -#define XML_GET_BOOL(key, dest) XML_GET_IF(key, dest = TRUE; ) -#define XML_GET_LIST(key, dest, func) XML_GET_IF(key, dest = g_slist_append(dest, func(doc, node)); ) -#define XML_GET_SUB(dest, func) if (xmlStrcmp(node->name, BAD_CAST "text") != 0 && func(dest, doc, node)) { ; } else -/*#define XML_GET_END(func) \ -{ fprintf(stderr, "%s: Unknown node %s.\n", func, node->name); }*/ -#define XML_GET_END(func) \ -if (xmlStrcmp(node->name, BAD_CAST "text") != 0) { /*fprintf(stderr, "%s: Unknown node %s.\n", func, node->name)*/; } - -#endif /* __xml_h__ */ +/* logjam - a GTK client for LiveJournal. + * Copyright (C) 2000-2003 Evan Martin + */ +#ifndef __LOGJAM_XML_H__ +#define __LOGJAM_XML_H__ + +#include + +extern void jam_xmlNewDoc (xmlDocPtr *doc, xmlNodePtr *node, char *name); + +extern char *jam_xmlGetString (xmlDocPtr doc, xmlNodePtr node); +extern guint32 jam_xmlGetUInt32 (xmlDocPtr doc, xmlNodePtr node); +extern gboolean jam_xmlGetInt (xmlDocPtr doc, xmlNodePtr node, int *value); + +extern xmlNodePtr jam_xmlAddInt (xmlNodePtr node, char *name, int val); + +extern void jam_xmlSetIntProp (xmlNodePtr node, const char *name, int value); +extern gboolean jam_xmlGetIntProp (xmlNodePtr node, const char *name, int *value); + + +/* from conf_xml.c + * + * basically, these XML_* functions run a series of ifs on the node name. + * be sure to end with XML_GET_END, which prints error information if a node + * wasn't handled. + */ +#define XML_GET_IF(key, what) if (xmlStrcmp(node->name, BAD_CAST key) == 0) { what } else +#define XML_GET_FUNC(key, dest, func) XML_GET_IF(key, dest = func(doc, node);) +#define XML_GET_STR(key, dest) XML_GET_FUNC(key, dest, jam_xmlGetString) +#define XML_GET_UINT32(key, dest) XML_GET_FUNC(key, dest, jam_xmlGetUInt32) +#define XML_GET_INT(key, dest) XML_GET_IF(key, jam_xmlGetInt(doc, node, &dest);) +#define XML_GET_BOOL(key, dest) XML_GET_IF(key, dest = TRUE; ) +#define XML_GET_LIST(key, dest, func) XML_GET_IF(key, dest = g_slist_append(dest, func(doc, node)); ) +#define XML_GET_SUB(dest, func) if (xmlStrcmp(node->name, BAD_CAST "text") != 0 && func(dest, doc, node)) { ; } else +#define XML_GET_END(func) if (xmlStrcmp(node->name, BAD_CAST "text") != 0) {} + + +#endif -- 2.11.4.GIT