diff options
| author | Damien Laniel <dlaniel@entrouvert.com> | 2009-02-05 16:56:29 +0000 |
|---|---|---|
| committer | Damien Laniel <dlaniel@entrouvert.com> | 2009-02-05 16:56:29 +0000 |
| commit | 88f6faaf5d9f8b3541df3c4a855b76fdf1cdb59d (patch) | |
| tree | 0c183438c5dda91fe7f0a99ac0b90f63dc107c5c | |
| parent | 4765d4ff18debb1e556adaa27d8eaf267f0052f4 (diff) | |
| download | lasso-88f6faaf5d9f8b3541df3c4a855b76fdf1cdb59d.tar.gz lasso-88f6faaf5d9f8b3541df3c4a855b76fdf1cdb59d.tar.xz lasso-88f6faaf5d9f8b3541df3c4a855b76fdf1cdb59d.zip | |
fixed parsing of OFTYPE
| -rw-r--r-- | bindings/bindings.py | 2 | ||||
| -rw-r--r-- | lasso/id-wsf-2.0/server.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bindings/bindings.py b/bindings/bindings.py index 0db922bf..e2cdf2a1 100644 --- a/bindings/bindings.py +++ b/bindings/bindings.py @@ -390,7 +390,7 @@ def parse_header(header_file): i += 1 line = line[:-1] + lines[i].lstrip() - m = re.match(r'LASSO_EXPORT\s+((?:const |)[\w]+\s*\*?)\s+(OFTYPE\(.*?\)\s+)?(\*?\w+)\s*\((.*?)\)', line) + m = re.match(r'LASSO_EXPORT\s+((?:const |)[\w]+\s*\*?)\s+(OFTYPE\(.*?\)\s*)?(\*?\w+)\s*\((.*?)\)', line) if m and not m.group(3).endswith('_get_type'): return_type, oftype, function_name, args = m.groups() return_type = return_type.strip() diff --git a/lasso/id-wsf-2.0/server.h b/lasso/id-wsf-2.0/server.h index 7d24ebb6..cde3295d 100644 --- a/lasso/id-wsf-2.0/server.h +++ b/lasso/id-wsf-2.0/server.h @@ -36,8 +36,8 @@ extern "C" { LASSO_EXPORT gint lasso_server_add_svc_metadata(LassoServer *server, LassoIdWsf2DiscoSvcMetadata *metadata); -LASSO_EXPORT const GList OFTYPE(LassoIdWsf2DiscoSvcMetadata) *lasso_server_get_svc_metadatas( - LassoServer *server); +LASSO_EXPORT const GList OFTYPE(LassoIdWsf2DiscoSvcMetadata) + *lasso_server_get_svc_metadatas(LassoServer *server); LASSO_EXPORT GList *lasso_server_get_svc_metadatas_with_id_and_type(LassoServer *server, GList *svcMDIDs, const gchar *service_type); |