Skip to content

Commit d02fb39

Browse files
Fix build warnings (tarantool#3757)
1 parent 8c6e8b1 commit d02fb39

File tree

19 files changed

+53
-131
lines changed

19 files changed

+53
-131
lines changed

doc/book/admin/_includes/upgrade_storages.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
.. // this instruction does not include the final step (calling box.snapshot())
2-
.. // because we need to add a warning after step 5 in one use of this instruction
1+
..
2+
This instruction does not include the final step (calling box.snapshot())
3+
because we need to add a warning after step 5 in one use of this instruction.
4+
35
Upgrade storage instances by performing the following steps for each replica set:
46

57
.. note::
@@ -25,5 +27,3 @@ Upgrade storage instances by performing the following steps for each replica set
2527
This will update the Tarantool system spaces to match the currently installed
2628
version of Tarantool. The changes will be propagated to other nodes via the
2729
replication mechanism later.
28-
29-

doc/book/admin/upgrades/upgrade_standalone.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Upgrading a standalone instance
3030
using a package manager or the :ref:`tt utility <tt-cli>`.
3131
See the installation instructions at Tarantool `download page <http://tarantool.org/download.html>`_
3232
and in the :ref:`tt install reference <tt-install>`.
33-
To check that the target Tarantool version is installed, run ``tarantool -v``.
33+
To check that the target Tarantool version is installed, run ``tarantool -v``.
3434

3535
#. Start your application on the target version.
3636

doc/contributing/docs/_includes/confval_template.rst

Lines changed: 0 additions & 13 deletions
This file was deleted.

doc/contributing/docs/api.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,12 @@ Configuration parameters
179179

180180
Example:
181181

182-
.. literalinclude:: ./_includes/confval_template.rst
182+
.. literalinclude:: /reference/configuration/cfg_basic.rst
183183
:language: rst
184+
:lines: 219-231
184185

185186
Result:
186187

187-
.. include:: ./_includes/confval_template.rst
188+
.. include:: /reference/configuration/cfg_basic.rst
189+
:start-line: 219
190+
:end-line: 231

doc/dev_guide/reference_capi/error.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
.. c:enum:: box_error_code
1010
1111
For a complete list of errors, refer to the Tarantool
12-
`error code header file <https://github.com/tarantool/tarantool/blob/2.10/src/box/errcode.h>`__
13-
(provided for version 2.10).
12+
`error code header file <https://github.com/tarantool/tarantool/blob/master/src/box/errcode.h>`__.
1413

1514
.. c:type:: box_error_t
1615

doc/dev_guide/reference_capi/fiber.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
Module fiber
33
===========================================================
44

5-
.. c:type:: struct fiber
5+
.. c:type:: fiber
66
77
Fiber - contains information about a :ref:`fiber <application_server_fibers>`.
88

9-
.. c:type:: typedef int (*fiber_func)(va_list)
9+
.. c:type:: int (*fiber_func)(va_list)
1010
1111
Function to run inside a fiber.
1212

13-
.. c:function:: struct fiber *fiber_new(const char *name, fiber_func f)
13+
.. c:function:: fiber *fiber_new(const char *name, fiber_func f)
1414
1515
Create a new fiber.
1616
@@ -25,7 +25,7 @@
2525
2626
See also: :ref:`fiber_start()<c_api-fiber-fiber_start>`
2727
28-
.. c:function:: struct fiber *fiber_new_ex(const char *name, const struct fiber_attr *fiber_attr, fiber_func f)
28+
.. c:function:: fiber *fiber_new_ex(const char *name, const struct fiber_attr *fiber_attr, fiber_func f)
2929
3030
Create a new fiber with defined attributes.
3131
@@ -147,17 +147,17 @@
147147
148148
Reschedule fiber to end of event loop cycle.
149149
150-
.. c:type:: struct slab_cache
150+
.. c:type:: slab_cache
151151
152152
.. c:function:: struct slab_cache *cord_slab_cache(void)
153153
154154
Return ``slab_cache`` suitable to use with ``tarantool/small`` library
155155
156-
.. c:function:: struct fiber *fiber_self(void)
156+
.. c:function:: fiber *fiber_self(void)
157157
158158
Return the current fiber.
159159
160-
.. c:type:: struct fiber_attr
160+
.. c:type:: fiber_attr
161161
162162
.. c:function:: void fiber_attr_new(void)
163163
@@ -196,7 +196,7 @@
196196
197197
.. _c_api-fiber_cond:
198198
199-
.. c:type:: struct fiber_cond
199+
.. c:type:: fiber_cond
200200
201201
A conditional variable: a synchronization primitive that allow fibers in
202202
Tarantool's :ref:`cooperative multitasking <app-cooperative_multitasking>`
@@ -212,7 +212,7 @@
212212
213213
Create a new conditional variable.
214214
215-
.. c:function:: void fiber_cond_delete(struct fiber_cond *cond)
215+
.. c:function:: void fiber_cond_delete(fiber_cond *cond)
216216
217217
Delete the conditional variable.
218218
@@ -254,7 +254,7 @@
254254
on every iteration.
255255
256256
:param struct fiber_cond* cond: conditional variable
257-
:param struct double timeout: timeout in seconds
257+
:param double timeout: timeout in seconds
258258
259259
:return: 0 on :ref:`fiber_cond_signal() <c_api-fiber_cond_signal>` call or a
260260
spurious wake up

doc/dev_guide/reference_capi/tuple.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
155155
.. _capi-tuple_key_def:
156156
157-
.. c:type:: typedef struct key_def box_key_def_t
157+
.. c:type:: box_key_def_t
158158
159159
Key definition
160160

doc/reference/configuration/cfg_basic.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
| Dynamic: yes
140140
141141
Setting ``read_only == true`` affects spaces differently depending on the
142-
:ref:`options <box_schema-space_create-options>` that were used during
142+
:ref:`options <space_opts_object>` that were used during
143143
:doc:`box.schema.space.create </reference/reference_lua/box_schema/space_create>`,
144144
as summarized by this chart:
145145

doc/reference/reference_lua/box_error/custom_type.rst

Lines changed: 0 additions & 75 deletions
This file was deleted.

doc/reference/reference_lua/box_session/push.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ box.session.push()
3737
* If the result is not an error, then the return is the boolean value ``true``.
3838
* When the return is ``true``, the message has gone to the network
3939
buffer as a :ref:`packet <box_protocol-iproto_protocol>`
40-
with a different :ref:`header code <box_protocol-responses_out_of_band>`
40+
with a different header code
4141
so the client can distinguish from an ordinary Okay response.
4242

4343
The server's sole job is to call ``box.session.push()``, there is no

0 commit comments

Comments
 (0)