Diff for /libaitcfg/src/parse.c between versions 1.6 and 1.6.2.1

version 1.6, 2011/05/01 17:24:28 version 1.6.2.1, 2011/05/10 20:52:36
Line 48  SUCH DAMAGE. Line 48  SUCH DAMAGE.
   
   
 // cfgDbg() Debug/Log operation  // cfgDbg() Debug/Log operation
static inline int cfgDbg(FILE *f, char *fmt, ...)static inline int
 cfgDbg(FILE *f, char *fmt, ...)
 {  {
         int ret = 0;          int ret = 0;
         va_list lst;          va_list lst;
Line 64  static inline int cfgDbg(FILE *f, char *fmt, ...) Line 65  static inline int cfgDbg(FILE *f, char *fmt, ...)
  * InvertQueue() InvertQueue order //{cfg} list of elements for revert   * InvertQueue() InvertQueue order //{cfg} list of elements for revert
  * @cfg = Head list element for revert    * @cfg = Head list element for revert 
 */  */
static inline void InvertQueue(sl_config * __restrict cfg)static inline void
 InvertQueue(sl_config * __restrict cfg)
 {  {
         struct tagPair *item, *next, *prev = NULL;          struct tagPair *item, *next, *prev = NULL;
   
Line 77  static inline void InvertQueue(sl_config * __restrict  Line 79  static inline void InvertQueue(sl_config * __restrict 
 }  }
   
 // cfgWrite() Write to file from config list  // cfgWrite() Write to file from config list
static inline int cfgWrite(FILE *f, sl_config * __restrict cfg, int whitespace)static inline int
 cfgWrite(FILE *f, sl_config * __restrict cfg, int whitespace)
 {  {
         struct tagPair *av;          struct tagPair *av;
         time_t tim;          time_t tim;
Line 144  static inline int cfgWrite(FILE *f, sl_config * __rest Line 147  static inline int cfgWrite(FILE *f, sl_config * __rest
  * @cfg = Head list element   * @cfg = Head list element
  * return: 0 ok; -1 error:: can`t allocate memory   * return: 0 ok; -1 error:: can`t allocate memory
 */  */
int ReadConfig(FILE *f, sl_config * __restrict cfg)int
 ReadConfig(FILE *f, sl_config * __restrict cfg)
 {  {
         u_char szLine[MAX_STR + 1];          u_char szLine[MAX_STR + 1];
         u_char szSection[MAX_STR + 1], *psAttr, *psVal;          u_char szSection[MAX_STR + 1], *psAttr, *psVal;
Line 259  int ReadConfig(FILE *f, sl_config * __restrict cfg) Line 263  int ReadConfig(FILE *f, sl_config * __restrict cfg)
  * @cfg = Head list element   * @cfg = Head list element
  * return: 0 ok; -1 error:: can`t write to file   * return: 0 ok; -1 error:: can`t write to file
 */  */
int WriteConfig(FILE *f, sl_config * __restrict cfg)int
 WriteConfig(FILE *f, sl_config * __restrict cfg)
 {  {
         return cfgWrite(f, cfg, 1);          return cfgWrite(f, cfg, 1);
 }  }
Line 270  int WriteConfig(FILE *f, sl_config * __restrict cfg) Line 275  int WriteConfig(FILE *f, sl_config * __restrict cfg)
  * @cfg = Head list element   * @cfg = Head list element
  * return: 0 ok; -1 error:: can`t write to file   * return: 0 ok; -1 error:: can`t write to file
 */  */
int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg)int
 cfg_WriteConfig(FILE *f, sl_config * __restrict cfg)
 {  {
         return cfgWrite(f, cfg, 0);          return cfgWrite(f, cfg, 0);
 }  }
Line 281  int cfg_WriteConfig(FILE *f, sl_config * __restrict cf Line 287  int cfg_WriteConfig(FILE *f, sl_config * __restrict cf
  * @add_cfg = Head list element of added list   * @add_cfg = Head list element of added list
  * return: 0 ok; -1 error:: can`t concat lists   * return: 0 ok; -1 error:: can`t concat lists
 */  */
int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)int
 ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)
 {  {
         struct tagPair *item;          struct tagPair *item;
         int ret = 0;          int ret = 0;
Line 303  int ConcatConfig(sl_config * __restrict cfg, sl_config Line 310  int ConcatConfig(sl_config * __restrict cfg, sl_config
  * @add_cfg = Head list element of merged list (destroy after all!)   * @add_cfg = Head list element of merged list (destroy after all!)
  * return: 0 ok; -1 error:: can`t merge lists   * return: 0 ok; -1 error:: can`t merge lists
 */  */
int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)int
 MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)
 {  {
         struct tagPair *item, *merge, *add_next, *next = NULL;          struct tagPair *item, *merge, *add_next, *next = NULL;
         int flg;          int flg;

Removed from v.1.6  
changed lines
  Added in v.1.6.2.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>