Diff for /libaitio/inc/aitio.h between versions 1.4 and 1.4.2.3

version 1.4, 2010/04/16 13:25:27 version 1.4.2.3, 2010/07/05 11:01:56
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 142  inline int io_MakeArray(char * __restrict psArgs, cons Line 130  inline int io_MakeArray(char * __restrict psArgs, cons
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; 1 successful unquoted string   * return: 0 nothing to do; 1 successful unquoted string
 */  */
inline int io_UnquotStr(unsigned char *psLine);inline int io_UnquotStr(unsigned char * __restrict psLine);
 /*  /*
  * io_LTrimStr() Remove left whitespaces from text string   * io_LTrimStr() Remove left whitespaces from text string
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * return: 0 nothing to do; !=0 Removed bytes
 */  */
inline int io_LTrimStr(unsigned char *psLine);inline int io_LTrimStr(unsigned char * __restrict psLine);
 /*  /*
  * io_RTrimStr() Remove right whitespaces from text string   * io_RTrimStr() Remove right whitespaces from text string
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * return: 0 nothing to do; !=0 Removed bytes
 */  */
inline int io_RTrimStr(unsigned char *psLine);inline int io_RTrimStr(unsigned char * __restrict psLine);
 /*  /*
  * io_TrimStr() Remove left and right whitespaces from text string   * io_TrimStr() Remove left and right whitespaces from text string
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * return: 0 nothing to do; !=0 Removed bytes
 */  */
inline int io_TrimStr(unsigned char *psLine);inline int io_TrimStr(unsigned char * __restrict psLine);
 /*  /*
  * io_Char2Hex() Convert from Char string to Hex string   * io_Char2Hex() Convert from Char string to Hex string
  * @psLine = Text string   * @psLine = Text string
Line 202  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 */
/*#define io_read(f, b, n) io_rread(f, b, n, -1, 1)
 * io_Make_Comp_Commands - Declare helper function for Commands completion arguments#define io_write(f, b, n) io_rwrite(f, b, n, -1, 1)
*/ 
#define IO_MAKE_COMP_COMMANDS(FUNC, CMDS)       \ 
        char *FUNC(const char *text, int state) \ 
        { \ 
                register int i; \ 
                int len = strlen(text); \ 
                for (i = state; CMDS[i].cmd_name; i++) { \ 
                        if (strncmp(CMDS[i].cmd_name, "---", 3) && \ 
                                        !strncmp(CMDS[i].cmd_name, text, len)) \ 
                                return strdup(CMDS[i].cmd_name); \ 
                } \ 
                return NULL; \ 
        } 
 
/* 
 * io_Make_Comp_Args - Declare helper function for Arguments completion 
*/ 
#define IO_MAKE_COMP_ARGS(FUNC, ARGS)   \ 
        char *FUNC(const char *text __attribute__((unused)), int state) \ 
        { \ 
                while (ARGS[state]) \ 
                        return strdup(ARGS[state]); \ 
                return NULL; \ 
        } 
 
/* 
 * io_Comp_Filename() Builtin helper function for filename completion arguments 
 * @text = Text line 
 * @state = Position state 
 * return: NULL not found filename, != NULL filename 
*/ 
char *io_Comp_Filename(const char *text, int state); 
   
   
 #endif  #endif

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


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