[BACK]Return to aitio.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / inc

Diff for /libaitio/inc/aitio.h between versions 1.2.2.3 and 1.4.2.10

version 1.2.2.3, 2010/03/11 00:17:52 version 1.4.2.10, 2010/09/08 17:43:50
Line 29  struct tagIOURL { Line 29  struct tagIOURL {
         char            *url_reserved;          char            *url_reserved;
 };  };
   
 struct tagIOCmd {  
         const char *cmd_name;  
         int (*cmd_func)(void *, FILE *, char **);  
         const char *cmd_doc;  
         const char *cmd_help;  
         char *(*cmd_comp)(const char *, int);  
 };  
   
 typedef struct tagIOCmd ioCommands_t;  
 typedef char *io_CompEntry_t(const char *, int);  
 typedef char **io_Completion_t(const char *, int, int);  
   
   
 // io_GetErrno() Get error code of last operation  // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();  inline int io_GetErrno();
 // io_GetError() Get error text of last operation  // io_GetError() Get error text of last operation
Line 126  inline int io_MakeAV(const char * __restrict csArgs, c Line 114  inline int io_MakeAV(const char * __restrict csArgs, c
 */  */
 inline int io_SizeArray(const char *csArgs, const char *csDelim);  inline int io_SizeArray(const char *csArgs, const char *csDelim);
 /*  /*
 * io_MakeArray() Parse and make array of arguments values * io_MakeArray() Parse and make array of arguments values ... 
 * @psArgs = Input arguments line *      (input string will be modified! and output array must be free)
  * @psArgs = Input arguments line, after execute string is modified!!!
  * @csDelim = Delimiter(s) for separate   * @csDelim = Delimiter(s) for separate
  * @args = Output array of arguments ... (must be free() after procced function!)   * @args = Output array of arguments ... (must be free() after procced function!)
 * @nargs = Requested count of arguments * @nargs = Maximum requested count of arguments from input string psArgs
  * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items   * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
 */  */
 inline int io_MakeArray(char * __restrict psArgs, const char *csDelim,   inline int io_MakeArray(char * __restrict psArgs, const char *csDelim, 
                 char *** __restrict args, int nargs);                  char *** __restrict args, int nargs);
   
 /*  /*
    * io_UnquotStr() Remove quots from input text string 
    * @psLine = Text string
    * return: 0 nothing to do; 1 successful unquoted string
   */
   inline int io_UnquotStr(unsigned char * __restrict psLine);
   /*
    * io_LTrimStr() Remove left whitespaces from text string
    * @psLine = Text string
    * return: 0 nothing to do; !=0 Removed bytes
   */
   inline int io_LTrimStr(unsigned char * __restrict psLine);
   /*
    * io_RTrimStr() Remove right whitespaces from text string
    * @psLine = Text string
    * return: 0 nothing to do; !=0 Removed bytes
   */
   inline int io_RTrimStr(unsigned char * __restrict psLine);
   /*
    * io_TrimStr() Remove left and right whitespaces from text string
    * @psLine = Text string
    * return: 0 nothing to do; !=0 Removed bytes
   */
   inline int io_TrimStr(unsigned char * __restrict psLine);
   /*
    * io_Ch2Hex() Convert from Char string to Hex string
    * @psLine = Text string
    * @lineLen = Length of Text string
    * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free)
   */
   inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen);
   /*
    * io_Hex2Ch() Convert from Hex string to Char string
    * @psLine = Text string
    * @lineLen = Length of Text string
    * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free)
   */
   inline char *io_Hex2Ch(unsigned char *psLine, int lineLen);
   
   /*
  * ioURLGet() Parse and get data from input URL   * ioURLGet() Parse and get data from input URL
  * @csURL = Input URL line   * @csURL = Input URL line
  * @url = Output parsed URL   * @url = Output parsed URL
Line 162  int ioURLGetValue(struct tagIOURL *url, const char *cs Line 190  int ioURLGetValue(struct tagIOURL *url, const char *cs
 */  */
 int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);  int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);
   
 /*  
  * ioCLIComp() Initialize completion CLI features  
  * @cmdComplete = Completion function  
  * @cmdEntry = Compentry function  
  * return: none  
 */  
 inline void ioCLIComp(io_Completion_t *cmdComplete, io_CompEntry_t *cmdEntry);  
 /*  
  * ioCLIExec() Execute CLI main loop  
  * @cmdList = Commands list  
  * @out = Output handle  
  * @csPrompt = Prompt text  
  * return: -1 error, 0 = exit w/^+D, 1 done.  
 */  
 int ioCLIExec(ioCommands_t *cmdList, FILE *out, const char *csPrompt);  
   
 /*  /*
 * io_Cmd_Unsupported() Builtin helper function for unsupported commands * io_rread() Raw VFS read function
 * @cmds = Commands list * @fd = File handle
 * @out = Output handle * @buf = Read buffer
 * @args = Parsed arguments array * @nbytes = Read buffer size
 * return: -1 error, 0 = ok, 1 exit from Cli! * @offset = Read from position, if -1 read nbytes from current position
*/ * @update = Update file handle position !0
int io_Cmd_Unsupported(void *cmds, FILE *out, char ** __restrict args); * return: -1 error or !=-1 readed bytes
  */
 inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);
 /*  /*
 * io_Cmd_Help() Builtin helper function for Help screen * io_rwrite() Raw VFS write function
 * @cmds = Commands list * @fd = File handle
 * @out = Output handle * @buf = Write buffer
 * @args = Parsed arguments array * @nbytes = Write bytes from buffer
 * return: -1 error, 0 = ok * @offset = Write at position, if -1 write nbytes from current position
*/ * @update = Update file handle position !0
int io_Cmd_Help(void *cmds, FILE *out, char ** __restrict args); * return: -1 error or !=-1 writed bytes
/* */
 * io_Cmd_Exit() Builtin helper function for Exit from Cliinline int io_rwrite(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);
 * @cmds = Commands list 
 * @out = Output handle 
 * @args = Parsed arguments array 
 * return: 1 exit from Cli! 
*/ 
int io_Cmd_Exit(void *cmds, FILE *out, char ** __restrict args); 
   
/*/* Disk I/O helper macros */
 * io_Comp_Filename() Builtin helper function for filename completion arguments#define io_read(f, b, n) io_rread(f, b, n, -1, 1)
 * @text = Text line#define io_write(f, b, n) io_rwrite(f, b, n, -1, 1)
 * @state = Position state
 * return: NULL not found filename, != NULL filename
*//* Debug helper macros */
char *io_Comp_Filename(const char *text, int state);extern int io_Debug;
 
 #define io_initDebug(x)         io_Debug = (x);
 #define io_addDebug             io_Debug++
 #define ioDEBUG(x, fmt, ...)    do { \
                                         assert((fmt)); \
                                         char str[STRSIZ] = { 0 }; \
                                         snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \
                                         if ((x) <= io_Debug) \
                                                 syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \
                                                                 (x), __func__, __LINE__, str); \
                                 } while (0)
 #define ioERROR(x, fmt, ...)    do { \
                                         assert((fmt)); \
                                         char str[STRSIZ] = { 0 }; \
                                         snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \
                                         if ((x) <= io_Debug) \
                                                 syslog(LOG_ERR, "ioError(%d):%s(%d): %s\n", \
                                                                 (x), __func__, __LINE__, str); \
                                 } while (0)
 
 #define io_ifERROR(x)           if ((x)) { \
                                         syslog(LOG_ERR, "ioError(if):%s(%d): #%d - %s\n", \
                                                         __func__, __LINE__, (x), strerror((x)));
 #define io_endERROR()           }
 #define io_sysERROR()           do { \
                                         if (errno) \
                                                 syslog(LOG_ERR, "ioError(sys):%s(%d): #%d - %s\n", \
                                                                 __func__, __LINE__, errno, strerror(errno)); \
                                 } while (0)
 #define io_aitERROR(ait)        do { \
                                         if (ait##_GetErrno()) \
                                                 syslog(LOG_ERR, "ioError(ait):%s(%d): #%d - %s\n", \
                                                                 __func__, __LINE__, ait##_GetErrno(), \
                                                                 ait##_GetError()); \
                                 } while (0)
   
   
 #endif  #endif
Removed from v.1.2.2.3  
changed lines
  Added in v.1.4.2.10

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