Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

docs: Various XML fixes

Browse Source 
* channels/pjsip/dialplan_functions_doc.xml: Added xmlns:xi to docs element.

* main/bucket.c: Removed XML completely since the "bucket" and "file" objects
  are internal only with no config file.

* main/named_acl.c: Fixed the configFile element name. It was "named_acl.conf"
  and should have been "acl.conf"

* res/res_geolocation/geoloc_doc.xml: Added xmlns:xi to docs element.

* res/res_http_media_cache.c: Fixed the configFile element name. It was
  "http_media_cache.conf" and should have been "res_http_media_cache.conf".
pull/1069/head
George Joseph 3 months ago committed by asterisk-org-access-app[bot]
parent 1047291662
commit 114fa12f05
5 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
channels/pjsip/dialplan_functions_doc.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE docs SYSTEM "appdocsxml.dtd"> <!DOCTYPE docs SYSTEM "appdocsxml.dtd">
<docs> <docs xmlns:xi="http://www.w3.org/2001/XInclude">
<application name="PJSIPHangup" language="en_US"> <application name="PJSIPHangup" language="en_US">
<synopsis> <synopsis>
Hangup an incoming PJSIP channel with a SIP response code Hangup an incoming PJSIP channel with a SIP response code

46
main/bucket.c
Unescape View File

@ -28,36 +28,6 @@
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/
/*** DOCUMENTATION
<configInfo name="core" language="en_US">
<synopsis>Bucket file API</synopsis>
<configFile name="bucket">
<configObject name="bucket">
<configOption name="scheme">
<synopsis>Scheme in use for bucket</synopsis>
</configOption>
<configOption name="created">
<synopsis>Time at which the bucket was created</synopsis>
</configOption>
<configOption name="modified">
<synopsis>Time at which the bucket was last modified</synopsis>
</configOption>
</configObject>
<configObject name="file">
<configOption name="scheme">
<synopsis>Scheme in use for file</synopsis>
</configOption>
<configOption name="created">
<synopsis>Time at which the file was created</synopsis>
</configOption>
<configOption name="modified">
<synopsis>Time at which the file was last modified</synopsis>
</configOption>
</configObject>
</configFile>
</configInfo>
***/
#include "asterisk.h" #include "asterisk.h"
#ifdef HAVE_URIPARSER #ifdef HAVE_URIPARSER
@ -982,14 +952,14 @@ int ast_bucket_init(void)
return -1; return -1;
} }
if (ast_sorcery_object_register(bucket_sorcery, "bucket", bucket_alloc, NULL, NULL)) { if (ast_sorcery_internal_object_register(bucket_sorcery, "bucket", bucket_alloc, NULL, NULL)) {
ast_log(LOG_ERROR, "Failed to register 'bucket' object type in Bucket sorcery\n"); ast_log(LOG_ERROR, "Failed to register 'bucket' object type in Bucket sorcery\n");
return -1; return -1;
} }
ast_sorcery_object_field_register(bucket_sorcery, "bucket", "scheme", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_bucket, scheme)); ast_sorcery_object_field_register_nodoc(bucket_sorcery, "bucket", "scheme", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_bucket, scheme));
ast_sorcery_object_field_register_custom(bucket_sorcery, "bucket", "created", "", timeval_str2struct, timeval_struct2str, NULL, 0, FLDSET(struct ast_bucket, created)); ast_sorcery_object_field_register_custom_nodoc(bucket_sorcery, "bucket", "created", "", timeval_str2struct, timeval_struct2str, NULL, 0, FLDSET(struct ast_bucket, created));
ast_sorcery_object_field_register_custom(bucket_sorcery, "bucket", "modified", "", timeval_str2struct, timeval_struct2str, NULL, 0, FLDSET(struct ast_bucket, modified)); ast_sorcery_object_field_register_custom_nodoc(bucket_sorcery, "bucket", "modified", "", timeval_str2struct, timeval_struct2str, NULL, 0, FLDSET(struct ast_bucket, modified));
ast_sorcery_object_set_copy_handler(bucket_sorcery, "bucket", bucket_copy_handler); ast_sorcery_object_set_copy_handler(bucket_sorcery, "bucket", bucket_copy_handler);
if (ast_sorcery_apply_default(bucket_sorcery, "file", "bucket_file", NULL) == AST_SORCERY_APPLY_FAIL) { if (ast_sorcery_apply_default(bucket_sorcery, "file", "bucket_file", NULL) == AST_SORCERY_APPLY_FAIL) {
@ -997,14 +967,14 @@ int ast_bucket_init(void)
return -1; return -1;
} }
if (ast_sorcery_object_register(bucket_sorcery, "file", bucket_file_alloc, NULL, NULL)) { if (ast_sorcery_internal_object_register(bucket_sorcery, "file", bucket_file_alloc, NULL, NULL)) {
ast_log(LOG_ERROR, "Failed to register 'file' object type in Bucket sorcery\n"); ast_log(LOG_ERROR, "Failed to register 'file' object type in Bucket sorcery\n");
return -1; return -1;
} }
ast_sorcery_object_field_register(bucket_sorcery, "file", "scheme", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_bucket_file, scheme)); ast_sorcery_object_field_register_nodoc(bucket_sorcery, "file", "scheme", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_bucket_file, scheme));
ast_sorcery_object_field_register_custom(bucket_sorcery, "file", "created", "", timeval_str2struct, timeval_struct2str, NULL, 0, FLDSET(struct ast_bucket_file, created)); ast_sorcery_object_field_register_custom_nodoc(bucket_sorcery, "file", "created", "", timeval_str2struct, timeval_struct2str, NULL, 0, FLDSET(struct ast_bucket_file, created));
ast_sorcery_object_field_register_custom(bucket_sorcery, "file", "modified", "", timeval_str2struct, timeval_struct2str, NULL, 0, FLDSET(struct ast_bucket_file, modified)); ast_sorcery_object_field_register_custom_nodoc(bucket_sorcery, "file", "modified", "", timeval_str2struct, timeval_struct2str, NULL, 0, FLDSET(struct ast_bucket_file, modified));
ast_sorcery_object_set_copy_handler(bucket_sorcery, "file", bucket_file_copy_handler); ast_sorcery_object_set_copy_handler(bucket_sorcery, "file", bucket_file_copy_handler);
return 0; return 0;

2
main/named_acl.c
Unescape View File

@ -51,7 +51,7 @@
/*** DOCUMENTATION /*** DOCUMENTATION
<configInfo name="named_acl" language="en_US"> <configInfo name="named_acl" language="en_US">
<configFile name="named_acl.conf"> <configFile name="acl.conf">
<configObject name="named_acl"> <configObject name="named_acl">
<synopsis>Options for configuring a named ACL</synopsis> <synopsis>Options for configuring a named ACL</synopsis>
<configOption name="permit"> <configOption name="permit">

2
res/res_geolocation/geoloc_doc.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE docs SYSTEM "appdocsxml.dtd"> <!DOCTYPE docs SYSTEM "appdocsxml.dtd">
<docs> <docs xmlns:xi="http://www.w3.org/2001/XInclude">
<configInfo name="res_geolocation" language="en_US"> <configInfo name="res_geolocation" language="en_US">
<synopsis>Core Geolocation Support</synopsis> <synopsis>Core Geolocation Support</synopsis>
<configFile name="geolocation.conf"> <configFile name="geolocation.conf">

2
res/res_http_media_cache.c
Unescape View File

@ -34,7 +34,7 @@
/*** DOCUMENTATION /*** DOCUMENTATION
<configInfo name="res_http_media_cache" language="en_US"> <configInfo name="res_http_media_cache" language="en_US">
<synopsis>HTTP media cache</synopsis> <synopsis>HTTP media cache</synopsis>
<configFile name="http_media_cache.conf"> <configFile name="res_http_media_cache.conf">
<configObject name="general"> <configObject name="general">
<synopsis>General configuration</synopsis> <synopsis>General configuration</synopsis>
<configOption name="timeout_secs" default="180"> <configOption name="timeout_secs" default="180">

Write Preview
Loading…
Cancel
Save