Diff for /libaitwww/inc/aitwww.h between versions 1.4.2.3 and 1.5.4.1

version 1.4.2.3, 2012/08/06 12:02:05 version 1.5.4.1, 2013/01/17 14:07:19
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 50  SUCH DAMAGE. Line 50  SUCH DAMAGE.
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/queue.h>  #include <sys/queue.h>
 #include <sys/uio.h>  #include <sys/uio.h>
#include <aitio.h>#include <elwix.h>
   
   
 /* URL staff ... */  /* URL staff ... */
Line 61  typedef struct _tagURLItem { Line 61  typedef struct _tagURLItem {
 } url_Item_t;  } url_Item_t;
   
 struct tagIOURL {  struct tagIOURL {
        unsigned char        url_line[BUFSIZ];        ait_val_t        url_line;
   
        url_Item_t      url_tech;        ait_val_t      url_tech;
        url_Item_t      url_user;        ait_val_t      url_user;
        url_Item_t      url_pass;        ait_val_t      url_pass;
        url_Item_t      url_host;        ait_val_t      url_host;
        url_Item_t      url_port;        ait_val_t      url_port;
        url_Item_t      url_path;        ait_val_t      url_path;
        url_Item_t      url_args;        ait_val_t      url_args;
   
        char            *url_reserved;        unsigned char   *url_reserved;
 };  };
   
 struct tagReqXML {  struct tagReqXML {
Line 232  int www_cmptype(const char *ct, const char *type); Line 232  int www_cmptype(const char *ct, const char *type);
  *   *
  * @str = query string   * @str = query string
  * @delim = delimiter   * @delim = delimiter
 * return: NULL error or AV pair, must be io_free() after use! * return: NULL error or AV pair, must be e_free() after use!
  */   */
 ait_val_t *www_getpair(char ** __restrict str, const char *delim);  ait_val_t *www_getpair(char ** __restrict str, const char *delim);
 /*  /*
Line 253  inline void www_unescape(char * __restrict str); Line 253  inline void www_unescape(char * __restrict str);
  * www_undot() - Undotted and clean WWW query filename   * www_undot() - Undotted and clean WWW query filename
  *   *
  * @pname = query filename   * @pname = query filename
 * return: =NULL error or !=NULL allocated valid filename, after use you must call io_freeVar() * return: =NULL error or !=NULL allocated valid filename, after use you must call ait_freeVar()
  */   */
 ait_val_t *www_undot(const char * __restrict pname);  ait_val_t *www_undot(const char * __restrict pname);
   
   
 /*  /*
    * www_URLInit() - Init URL structure and free old one
    *
    * @url = Input URL
    * return: -1 error or 0 ok
    */
   inline int www_URLInit(struct tagIOURL * __restrict url);
   /*
    * www_URLFree() - URL free structure
    *
    * @url = Input parsed URL
    * return: none
    */
   inline void www_URLFree(struct tagIOURL * __restrict url);
   /*
  * www_URLGet() - Parse and get data from input URL   * www_URLGet() - Parse and get data from input URL
  *   *
  * @csURL = Input URL line   * @csURL = Input URL line
Line 266  ait_val_t *www_undot(const char * __restrict pname); Line 280  ait_val_t *www_undot(const char * __restrict pname);
  * return: 0 error format not find tech:// and return URL like path;    * return: 0 error format not find tech:// and return URL like path; 
  *              -1 error:: can`t read; >0 ok, up bits for known elements   *              -1 error:: can`t read; >0 ok, up bits for known elements
  */   */
int www_URLGet(const char *csURL, struct tagIOURL *url);int www_URLGet(const char *csURL, struct tagIOURL * __restrict url);
 /*  /*
  * www_URLGetFile() - Get file from parsed URL   * www_URLGetFile() - Get file from parsed URL
  *   *
  * @url = Input parsed URL   * @url = Input parsed URL
 * @psValue = Return filename, if not specified file in url path, replace with / * @value = Return filename, if not specified file in url path, replace with /
 * @valLen = Size of psValue array * return: -1 error, 0 filename from path, 1 filename or 2 not specified filename
 * return: -1 error:: can`t read; 0 ok 
  */   */
int www_URLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);int www_URLGetFile(struct tagIOURL * __restrict url, ait_val_t * __restrict value);
   
 /*  /*
  * www_XMLGet() - Parse and get data from input XML request string    * www_XMLGet() - Parse and get data from input XML request string 
Line 286  int www_URLGetFile(struct tagIOURL *url, char * __rest Line 299  int www_URLGetFile(struct tagIOURL *url, char * __rest
  * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits   * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits
  */   */
 int www_XMLGet(const char *csXML, struct tagReqXML *xml);  int www_XMLGet(const char *csXML, struct tagReqXML *xml);
   
   /*
    * www_b64encode() - Base64 encode function
    *
    * @src = source data
    * return: NULL error or !=NULL encoded variable, after use call ait_freeVar()
    */
   ait_val_t *www_b64encode(ait_val_t * __restrict src);
   /*
    * www_b64decode() - Base64 decode function
    *
    * @src = source encoded data
    * return: NULL error or !=NULL decoded variable, after use call ait_freeVar()
    */
   ait_val_t *www_b64decode(ait_val_t * __restrict src);
   
   
 #endif  #endif

Removed from v.1.4.2.3  
changed lines
  Added in v.1.5.4.1


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