psyc-mirrors
/
libpsyc
mirror of git://git.psyc.eu/libpsyc
1
0
Fork 0
Code Issues Releases Wiki Activity

typedef my enum!

This commit is contained in:
psyc://psyced.org/~lynX 2011-04-20 15:36:56 +02:00
parent 65b508bfa2
commit 2f59265338
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/psyc.h
View File

@ -23,8 +23,8 @@
/** @brief Checks if short keyword string matches long keyword string
*/
int PSYC_matches(uint8_t* sho, size_t slen,
uint8_t* lon, size_t llen);
int PSYC_matches(char* sho, size_t slen,
char* lon, size_t llen);
/** @brief Callback for PSYC_text() that produces a value for a match
*

10
include/psyc/parser.h
View File

@ -20,10 +20,12 @@
/** Different types that a variable can have
*
* This enum lists all the types that a variable
* in a psyc packet can have
* This enum lists PSYC variable types that
* this library is capable of checking for
* validity. Other variable types are treated
* as opaque data.
*/
enum PSYC_Types {
typedef enum {
PSYC_TYPE_AMOUNT,
PSYC_TYPE_COLOR,
PSYC_TYPE_DATE,
@ -36,7 +38,7 @@ enum PSYC_Types {
PSYC_TYPE_PAGE,
PSYC_TYPE_UNIFORM,
PSYC_TYPE_TIME,
};
} PSYC_Type;
enum PSYC_Flags
{

10
src/match.c
View File

@ -2,9 +2,9 @@
/* TODO: PSYC_inherits() */
int PSYC_matches(uint8_t* sho, size_t slen,
uint8_t* lon, size_t llen) {
uint8_t *s, *l, *se, *le;
int PSYC_matches(char* sho, size_t slen,
char* lon, size_t llen) {
char *s, *l, *se, *le;
if (!slen) slen = strlen(sho);
if (!llen) llen = strlen(lon);
@ -35,10 +35,10 @@ int PSYC_matches(uint8_t* sho, size_t slen,
/* doesn't always work this way.. FIXME */
*se = *le = '_';
sho++; lon++;
while(s = strchr(sho, '_')) {
while((s = strchr(sho, '_'))) {
*s = 0;
PT(("sho goes '%c' and lon goes '%c'\n", *sho, *lon))
while(l = strchr(lon, '_')) {
while((l = strchr(lon, '_'))) {
*l = 0;
PT(("strcmp short '%s' long '%s'\n", sho, lon))
if (!strcmp(sho, lon)) goto foundone;