1
0
Fork 0
mirror of git://git.psyc.eu/libpsyc synced 2024-08-15 03:19:02 +00:00

psyc_is_var_routing() -> psyc_var_routing()

This commit is contained in:
tg(x) 2012-01-31 19:34:11 +01:00
parent 8fcceff88f
commit eaeab8c226
7 changed files with 76 additions and 76 deletions

View file

@ -1,7 +1,7 @@
#ifndef PSYC_METHOD_H
#define PSYC_METHOD_H
typedef enum PsycMethodFlag {
typedef enum {
PSYC_METHOD_TEMPLATE = 1 << 0,
PSYC_METHOD_REPLY = 1 << 1,
PSYC_METHOD_VISIBLE = 1 << 2,
@ -9,7 +9,7 @@ typedef enum PsycMethodFlag {
PSYC_METHOD_MANUAL = 1 << 4,
} PsycMethodFlag;
typedef enum PsycMethod {
typedef enum {
PSYC_MC_UNKNOWN,
PSYC_MC_DATA,

View file

@ -8,8 +8,7 @@
#include "packet.h"
/// Routing variables in alphabetical order.
//extern const PsycString psyc_routing_vars[];
extern const PsycDictInt psyc_routing_vars[];
extern const PsycDictInt psyc_rvars[];
// Variable types in alphabetical order.
extern const PsycDictInt psyc_var_types[];
@ -17,18 +16,35 @@ extern const PsycDictInt psyc_var_types[];
/// Method names in alphabetical order.
extern const PsycDictInt psyc_methods[];
extern const size_t psyc_routing_vars_num;
extern const size_t psyc_rvars_num;
extern const size_t psyc_var_types_num;
extern const size_t psyc_methods_num;
typedef enum {
PSYC_RVAR_UNKNOWN,
PSYC_RVAR_AMOUNT_FRAGMENTS,
PSYC_RVAR_CONTEXT,
PSYC_RVAR_COUNTER,
PSYC_RVAR_FRAGMENT,
PSYC_RVAR_SOURCE,
PSYC_RVAR_SOURCE_RELAY,
PSYC_RVAR_TAG,
PSYC_RVAR_TAG_RELAY,
PSYC_RVAR_TARGET,
PSYC_RVAR_TARGET_RELAY,
PSYC_RVARS_NUM,
} PsycRoutingVar;
/**
* Is this a routing variable name?
* Look up routing variable.
*/
static inline PsycBool
psyc_var_is_routing (const char *name, size_t len)
static inline PsycRoutingVar
psyc_var_routing (const char *name, size_t len)
{
return (PsycBool) psyc_dict_lookup((PsycDict *)psyc_routing_vars,
psyc_routing_vars_num, name, len, PSYC_NO);
return (PsycRoutingVar) psyc_dict_lookup((PsycDict *)psyc_rvars,
psyc_rvars_num, name, len, PSYC_NO);
}
/**