[BACK]Return to str.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / src

Diff for /libelwix/src/str.c between versions 1.5.8.1 and 1.7.28.1

version 1.5.8.1, 2015/06/25 00:36:48 version 1.7.28.1, 2018/05/31 15:34:28
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 - 2015Copyright 2004 - 2018
         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 230  str_Hex2Dig(const char *psLine) Line 230  str_Hex2Dig(const char *psLine)
 {  {
         register int i, j;          register int i, j;
         char *str, szWork[3] = { 0, 0, 0 };          char *str, szWork[3] = { 0, 0, 0 };
        ait_val_t *v, s;        ait_val_t *v, s = AIT_VAL_INIT;
         u_char *b;          u_char *b;
         int n;          int n;
   
Line 432  str_Lower(char * __restrict psLine) Line 432  str_Lower(char * __restrict psLine)
 }  }
   
 /*  /*
 * str_getString() - Get string from data buffer * str_getString() - Get NULL delimited string from data buffer
  *   *
 * @data = Data buffer * @data = Const data buffer
  * @dlen = Data length   * @dlen = Data length
  * @next = Return next position after string if !=NULL   * @next = Return next position after string if !=NULL
  * return: -1 error or size of string    * return: -1 error or size of string 
Line 458  str_getString(const u_char * __restrict data, int dlen Line 458  str_getString(const u_char * __restrict data, int dlen
         if (next)          if (next)
                 *next = (char*) pos + 1;                  *next = (char*) pos + 1;
         return pos - data + 1;          return pos - data + 1;
   }
   
   /*
    * str_getString2() - Get string from data buffer with delimiter
    *
    * @data = Data buffer
    * @dlen = Data length
    * @delim = Data delimiter
    * @next = Return next position after delimited string if !=NULL
    * return: -1 error or size of string 
    */
   int
   str_getString2(char * __restrict data, int dlen, char delim, char ** __restrict next)
   {
           char *pos;
   
           if (!data || !dlen)
                   return -1;
   
           for (pos = data; pos < data + dlen; pos++)
                   if (!*pos || *pos == (u_char) delim) {
                           *pos = 0;
                           break;
                   }
           if (*pos) {
                   elwix_SetErr(ENOEXEC, "Not found null-terminated string");
                   return -1;
           }
   
           if (next)
                   *next = (char*) pos + 1;
           return pos - data;
 }  }
Removed from v.1.5.8.1  
changed lines
  Added in v.1.7.28.1

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