fix compilation with latest aversive

[protos/xbee-avr.git] / parse_string.c

diff --git a/parse_string.c b/parse_string.c
deleted file mode 100644 (file)
index 2083b59..0000000
--- a/parse_string.c
+++ /dev/null
@@ -1,169 +0,0 @@
-#include <stdio.h>
-#include <inttypes.h>
-#include <ctype.h>
-#include <string.h>
-
-#include "parse.h"
-#include "parse_string.h"
-
-struct token_ops token_string_ops = {
-       .parse = parse_string,
-       .complete_get_nb = complete_get_nb_string,
-       .complete_get_elt = complete_get_elt_string,
-       .get_help = get_help_string,
-};
-
-#define MULTISTRING_HELP PSTR("Mul-choice STRING")
-#define ANYSTRING_HELP   PSTR("Any STRING")
-#define FIXEDSTRING_HELP PSTR("Fixed STRING")
-
-static uint8_t
-get_token_len(const prog_char * s)
-{
-       prog_char c;
-       uint8_t i=0;
-
-       c = pgm_read_byte(s+i);
-       while (c!='#' && c!='\0') {
-               i++;
-               c = pgm_read_byte(s+i);
-       }
-       return i;
-}
-
-static const prog_char *
-get_next_token(const prog_char * s)
-{
-       uint8_t i;
-       i = get_token_len(s);
-       if (pgm_read_byte(s+i) == '#')
-               return s+i+1;
-       return NULL;
-}
-
-int8_t
-parse_string(parse_pgm_token_hdr_t * tk, const char * buf, void * res)
-{
-       struct token_string_data sd;
-       uint8_t token_len;
-       const prog_char * str;
-
-       if (! *buf)
-               return -1;
-
-       memcpy_P(&sd, &((struct token_string *)tk)->string_data, sizeof(sd));
-
-       /* fixed string */
-       if (sd.str) {
-               str = sd.str;
-               do {
-                       token_len = get_token_len(str);
-
-                       /* if token is too big... */
-                       if (token_len >= STR_TOKEN_SIZE - 1) {
-                               continue;
-                       }
-
-                       if ( strncmp_P(buf, str, token_len) ) {
-                               continue;
-                       }
-
-                       if ( !isendoftoken(*(buf+token_len)) ) {
-                               continue;
-                       }
-
-                       break;
-               } while ( (str = get_next_token(str)) != NULL );
-
-               if (!str)
-                       return -1;
-       }
-       /* unspecified string */
-       else {
-               token_len=0;
-               while(!isendoftoken(buf[token_len]) &&
-                     token_len < (STR_TOKEN_SIZE-1))
-                       token_len++;
-
-               /* return if token too long */
-               if (token_len >= STR_TOKEN_SIZE - 1) {
-                       return -1;
-               }
-       }
-
-       if (res) {
-               /* we are sure that token_len is < STR_TOKEN_SIZE-1 */
-               strncpy(res, buf, token_len);
-               *((char *)res + token_len) = 0;
-       }
-
-       return token_len;
-}
-
-int8_t complete_get_nb_string(parse_pgm_token_hdr_t * tk)
-{
-       struct token_string_data sd;
-       int8_t ret=1;
-
-       memcpy_P(&sd, &((struct token_string *)tk)->string_data, sizeof(sd));
-
-       if (!sd.str)
-               return 0;
-
-       while( (sd.str = get_next_token(sd.str)) != NULL ) {
-               ret++;
-       }
-       return ret;
-}
-
-int8_t complete_get_elt_string(parse_pgm_token_hdr_t * tk, int8_t idx,
-                             char * dstbuf, uint8_t size)
-{
-       struct token_string_data sd;
-       const prog_char * s;
-       uint8_t len;
-
-       memcpy_P(&sd, &((struct token_string *)tk)->string_data, sizeof(sd));
-       s = sd.str;
-
-       while (idx-- && s)
-               s = get_next_token(s);
-
-       if (!s)
-               return -1;
-
-       len = get_token_len(s);
-       if (len > size - 1)
-               return -1;
-
-       memcpy_P(dstbuf, s, len);
-       dstbuf[len] = '\0';
-
-       return 0;
-}
-
-
-int8_t get_help_string(parse_pgm_token_hdr_t * tk, char * dstbuf, uint8_t size)
-{
-       struct token_string_data sd;
-       const prog_char * s;
-
-       memcpy_P(&sd, &((struct token_string *)tk)->string_data, sizeof(sd));
-       s = sd.str;
-
-       if (s) {
-               if (get_next_token(s)) {
-                       strncpy_P(dstbuf, MULTISTRING_HELP, size);
-               }
-               else {
-                       strncpy_P(dstbuf, FIXEDSTRING_HELP, size);
-               }
-       }
-       else {
-               strncpy_P(dstbuf, ANYSTRING_HELP, size);
-       }
-
-       dstbuf[size-1] = '\0';
-
-       return 0;
-}