From 4a926612504ceb72cf5c831b07a0653ffa943a96 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 19 Nov 2020 14:07:58 +0100
Subject: [PATCH] Improvements for generated documentation for wrappers +
removed useless code in JAVA wrapper related to factory
---
include/linphone/api/c-factory.h | 2 +-
tools/metadoc.py | 5 ++++-
wrappers/java/jni.mustache | 1 -
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/linphone/api/c-factory.h b/include/linphone/api/c-factory.h
index ab2a2d9476..532a128f37 100644
--- a/include/linphone/api/c-factory.h
+++ b/include/linphone/api/c-factory.h
@@ -454,7 +454,7 @@ LINPHONE_PUBLIC LinphoneConfig *linphone_factory_create_config(LinphoneFactory *
* Creates an object #LinphoneConfig
* @param factory the #LinphoneFactory @notnil
* @param path the path of the config @maybenil
- * @param path the path of the factory @maybenil
+ * @param factory_path the path of the factory @maybenil
* @return a #LinphoneConfig @notnil
*/
LINPHONE_PUBLIC LinphoneConfig *linphone_factory_create_config_with_factory(LinphoneFactory *factory, const char *path, const char *factory_path);
diff --git a/tools/metadoc.py b/tools/metadoc.py
index 8a0f2a6e60..744704b090 100644
--- a/tools/metadoc.py
+++ b/tools/metadoc.py
@@ -337,7 +337,10 @@ class Parser:
match = self.constants_regex.search(text)
while match is not None:
- if match.start(1)-lastIndex > 0:
+ if match.start(1) == 0 and lastIndex == 0:
+ # Special case when text starts by constant
+ parts.append(self._parse_constant(text[match.start(1):match.end(1)]))
+ elif match.start(1)-lastIndex > 0:
parts.append(TextPart(text[lastIndex:match.start(1)]))
parts.append(self._parse_constant(text[match.start(1):match.end(1)]))
lastIndex = match.end(1)
diff --git a/wrappers/java/jni.mustache b/wrappers/java/jni.mustache
index fbd4047c1d..bc69b11943 100644
--- a/wrappers/java/jni.mustache
+++ b/wrappers/java/jni.mustache
@@ -547,7 +547,6 @@ JNIEXPORT jobject JNICALL Java_{{jni_package}}CoreImpl_getMediastreamerFactory(J
{{#notEmpty}}
JNIEXPORT {{return}} JNICALL {{name}}({{params}}) {
{{#notStatic}}{{classCName}} *cptr = ({{classCName}}*)ptr;
- {{#isLinphoneFactory}}cptr = linphone_factory_get();{{/isLinphoneFactory}}
if (cptr == nullptr) {
bctbx_error("{{name}}'s {{classCName}} C ptr is null!");
{{#hasListReturn}}
--
GitLab