mirror of
git://git.gnupg.org/gnupg.git
synced 2024-09-21 15:01:41 +02:00
* sexp-parse.h (snext): Don't use atoi_1 and digitp macros, so
that this file is useful by other applications too.
This commit is contained in:
parent
2f2eb1d202
commit
fbd0f91c82
@ -1,3 +1,8 @@
|
|||||||
|
2003-11-20 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
|
* sexp-parse.h (snext): Don't use atoi_1 and digitp macros, so
|
||||||
|
that this file is useful by other applications too.
|
||||||
|
|
||||||
2003-10-27 Werner Koch <wk@gnupg.org>
|
2003-10-27 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
* command.c (cmd_get_confirmation): New command.
|
* command.c (cmd_get_confirmation): New command.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* sexp-parse.h - S-Exp helper functions
|
/* sexp-parse.h - S-Exp helper functions
|
||||||
* Copyright (C) 2002 Free Software Foundation, Inc.
|
* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GnuPG.
|
* This file is part of GnuPG.
|
||||||
*
|
*
|
||||||
@ -21,10 +21,10 @@
|
|||||||
#ifndef SEXP_PARSE_H
|
#ifndef SEXP_PARSE_H
|
||||||
#define SEXP_PARSE_H
|
#define SEXP_PARSE_H
|
||||||
|
|
||||||
#include "../common/util.h"
|
#include <gpg-error.h>
|
||||||
|
|
||||||
/* Return the length of the next S-Exp part and update the pointer to
|
/* Return the length of the next S-Exp part and update the pointer to
|
||||||
the first data byte. 0 is return on error */
|
the first data byte. 0 is returned on error */
|
||||||
static inline size_t
|
static inline size_t
|
||||||
snext (unsigned char const **buf)
|
snext (unsigned char const **buf)
|
||||||
{
|
{
|
||||||
@ -32,8 +32,8 @@ snext (unsigned char const **buf)
|
|||||||
int n;
|
int n;
|
||||||
|
|
||||||
s = *buf;
|
s = *buf;
|
||||||
for (n=0; *s && *s != ':' && digitp (s); s++)
|
for (n=0; *s && *s != ':' && (*s >= '0' && *s <= '9'); s++)
|
||||||
n = n*10 + atoi_1 (s);
|
n = n*10 + (*s - '0');
|
||||||
if (!n || *s != ':')
|
if (!n || *s != ':')
|
||||||
return 0; /* we don't allow empty lengths */
|
return 0; /* we don't allow empty lengths */
|
||||||
*buf = s+1;
|
*buf = s+1;
|
||||||
@ -46,7 +46,7 @@ snext (unsigned char const **buf)
|
|||||||
remainder of an S-Expression if the current position is somewhere
|
remainder of an S-Expression if the current position is somewhere
|
||||||
in an S-Expression. The function may return an error code if it
|
in an S-Expression. The function may return an error code if it
|
||||||
encounters an impossible conditions */
|
encounters an impossible conditions */
|
||||||
static inline int
|
static inline gpg_error_t
|
||||||
sskip (unsigned char const **buf, int *depth)
|
sskip (unsigned char const **buf, int *depth)
|
||||||
{
|
{
|
||||||
const unsigned char *s = *buf;
|
const unsigned char *s = *buf;
|
||||||
@ -83,7 +83,8 @@ sskip (unsigned char const **buf, int *depth)
|
|||||||
|
|
||||||
/* Check whether the the string at the address BUF points to matches
|
/* Check whether the the string at the address BUF points to matches
|
||||||
the token. Return true on match and update BUF to point behind the
|
the token. Return true on match and update BUF to point behind the
|
||||||
token. */
|
token. Return false and dont update tha buffer if it does not
|
||||||
|
match. */
|
||||||
static inline int
|
static inline int
|
||||||
smatch (unsigned char const **buf, size_t buflen, const char *token)
|
smatch (unsigned char const **buf, size_t buflen, const char *token)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user