Skip to content

Commit 886a8be

Browse files
author
Libmodulemd CI
committed
Updating libmodulemd docs for b9bdfbe424f3b80ae71527a460a395bf4943190a
Signed-off-by: Libmodulemd CI <[email protected]>
1 parent cc15fef commit 886a8be

File tree

3 files changed

+35
-26
lines changed

3 files changed

+35
-26
lines changed

libmodulemd/latest/ch04.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<dt><span class="glossterm"><a name="annotation-glossterm-nullable"></a>nullable</span></dt>
4141
<dd class="glossdef"><p>NULL may be passed as the value in, out, in-out; or as a return value.</p></dd>
4242
<a name="glsO"></a><h3 class="title">O</h3>
43+
<dt><span class="glossterm"><a name="annotation-glossterm-optional"></a>optional</span></dt>
44+
<dd class="glossdef"><p>NULL may be passed instead of a pointer to a location.</p></dd>
4345
<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
4446
<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
4547
<a name="glsP"></a><h3 class="title">P</h3>

libmodulemd/latest/modulemd-2.0-Modulemd.Module-(Private).html

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,16 @@ <h2><span class="refentrytitle"><a name="modulemd-2.0-Modulemd.Module-(Private).
145145
<em class="parameter"><code><a class="link" href="ModulemdDefaults.html" title="Modulemd.Defaults"><span class="type">ModulemdDefaults</span></a> *defaults</code></em>,
146146
<em class="parameter"><code><a class="link" href="ModulemdDefaults.html#ModulemdDefaultsVersionEnum" title="enum ModulemdDefaultsVersionEnum"><span class="type">ModulemdDefaultsVersionEnum</span></a> index_mdversion</code></em>,
147147
<em class="parameter"><code><a href="https://developer.gnome.org/glib/stable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
148-
<p>This function takes a defaults object, upgrades it to <em class="parameter"><code>index_mdversion</code></em>
149-
if it
150-
is lower and adds it to the <a class="link" href="modulemd-2.0-Modulemd.Module.html#ModulemdModule"><span class="type">ModulemdModule</span></a>. If it cannot upgrade it safely
151-
or the defaults are not for this module, it will return an appropriate
152-
error.</p>
148+
<p>This function takes a <a class="link" href="ModulemdDefaults.html" title="Modulemd.Defaults"><span class="type">ModulemdDefaults</span></a> object, upgrades it to
149+
<em class="parameter"><code>index_mdversion</code></em>
150+
if its version is lower and adds it to the <a class="link" href="modulemd-2.0-Modulemd.Module.html#ModulemdModule"><span class="type">ModulemdModule</span></a>
151+
object. If <em class="parameter"><code>defaults</code></em>
152+
cannot be upgraded safely or the <em class="parameter"><code>defaults</code></em>
153+
are not for <em class="parameter"><code>self</code></em>
154+
155+
module, it will return an appropriate error.</p>
156+
<p>(A use case is upgrading defaults of modules in a <a class="link" href="modulemd-2.0-Modulemd.ModuleIndex.html#ModulemdModuleIndex"><span class="type">ModulemdModuleIndex</span></a> to
157+
the highest defaults version added so far in the <a class="link" href="modulemd-2.0-Modulemd.ModuleIndex.html#ModulemdModuleIndex"><span class="type">ModulemdModuleIndex</span></a>.)</p>
153158
<div class="refsect3">
154159
<a name="modulemd-module-set-defaults.parameters"></a><h4>Parameters</h4>
155160
<div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -166,20 +171,18 @@ <h2><span class="refentrytitle"><a name="modulemd-2.0-Modulemd.Module-(Private).
166171
</tr>
167172
<tr>
168173
<td class="parameter_name"><p>defaults</p></td>
169-
<td class="parameter_description"><p>A <a class="link" href="ModulemdDefaults.html" title="Modulemd.Defaults"><span class="type">ModulemdDefaults</span></a> object to associate with this
170-
<a class="link" href="modulemd-2.0-Modulemd.Module.html#ModulemdModule"><span class="type">ModulemdModule</span></a>. If the module_name in the <a class="link" href="ModulemdDefaults.html" title="Modulemd.Defaults"><span class="type">ModulemdDefaults</span></a> object does not
171-
match this module, it will be rejected. </p></td>
172-
<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>]</span></td>
174+
<td class="parameter_description"><p>A <a class="link" href="ModulemdDefaults.html" title="Modulemd.Defaults"><span class="type">ModulemdDefaults</span></a> object whose copy to
175+
associate with this <a class="link" href="modulemd-2.0-Modulemd.Module.html#ModulemdModule"><span class="type">ModulemdModule</span></a>. A module name in <em class="parameter"><code>defaults</code></em>
176+
should
177+
match a name in the <em class="parameter"><code>self</code></em>
178+
module. Pass <a href="https://developer.gnome.org/glib/stable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to unset the defaults. </p></td>
179+
<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>][<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td>
173180
</tr>
174181
<tr>
175182
<td class="parameter_name"><p>index_mdversion</p></td>
176-
<td class="parameter_description"><p>The <a class="link" href="ModulemdDefaults.html#ModulemdDefaultsVersionEnum" title="enum ModulemdDefaultsVersionEnum"><span class="type">ModulemdDefaultsVersionEnum</span></a> of the highest
177-
defaults version added so far in the <a class="link" href="modulemd-2.0-Modulemd.ModuleIndex.html#ModulemdModuleIndex"><span class="type">ModulemdModuleIndex</span></a>. If non-zero,
178-
perform an upgrade to this version while adding <em class="parameter"><code>defaults</code></em>
179-
to <em class="parameter"><code>self</code></em>
180-
. If
181-
the <em class="parameter"><code>defaults</code></em>
182-
already has a higher version, just copy it. </p></td>
183+
<td class="parameter_description"><p>A minimal <a class="link" href="ModulemdDefaults.html#ModulemdDefaultsVersionEnum" title="enum ModulemdDefaultsVersionEnum"><span class="type">ModulemdDefaultsVersionEnum</span></a> version to
184+
upgrade <em class="parameter"><code>defaults</code></em>
185+
before adding them. </p></td>
183186
<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>]</span></td>
184187
</tr>
185188
<tr>
@@ -193,14 +196,14 @@ <h2><span class="refentrytitle"><a name="modulemd-2.0-Modulemd.Module-(Private).
193196
</div>
194197
<div class="refsect3">
195198
<a name="modulemd-module-set-defaults.returns"></a><h4>Returns</h4>
196-
<p> The mdversion of the defaults that were added. Returns
199+
<p> The upgraded version of the defaults that were added. Or
200+
<a class="link" href="ModulemdDefaults.html#MD-DEFAULTS-VERSION-UNSET:CAPS"><code class="literal">MD_DEFAULTS_VERSION_UNSET</code></a> if <em class="parameter"><code>defaults</code></em>
201+
was <a href="https://developer.gnome.org/glib/stable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. Returns
197202
<a class="link" href="ModulemdDefaults.html#MD-DEFAULTS-VERSION-ERROR:CAPS"><code class="literal">MD_DEFAULTS_VERSION_ERROR</code></a> and sets <em class="parameter"><code>error</code></em>
198-
if the default name didn't match
199-
or the Defaults object couldn't be upgraded successfully to
203+
if the defaults name didn't
204+
match or the defaults object couldn't be upgraded successfully to
200205
the <em class="parameter"><code>index_mdversion</code></em>
201-
. Returns <a class="link" href="ModulemdDefaults.html#MD-DEFAULTS-VERSION-UNSET:CAPS"><code class="literal">MD_DEFAULTS_VERSION_UNSET</code></a> if <em class="parameter"><code>defaults</code></em>
202-
was
203-
NULL.</p>
206+
.</p>
204207
</div>
205208
<p class="since">Since: <a class="link" href="ch05.html#api-index-2.0">2.0</a></p>
206209
</div>

libmodulemd/latest/modulemd-2.0-Modulemd.ModuleIndex.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,11 @@ <h2><span class="refentrytitle"><a name="modulemd-2.0-Modulemd.ModuleIndex.top_o
15411541
<em class="parameter"><code><a href="https://developer.gnome.org/glib/stable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
15421542
<p>Upgrades all <a class="link" href="ModulemdDefaults.html" title="Modulemd.Defaults"><span class="type">ModulemdDefaults</span></a> objects in this index to <em class="parameter"><code>mdversion</code></em>
15431543
if they
1544-
are not already at that version.</p>
1544+
are not already at that version. An attempt to downgrade or an attempt to
1545+
upgrade beyond the latest supported version will report an error. In the
1546+
case of a failure to upgrade a particular <a class="link" href="ModulemdDefaults.html" title="Modulemd.Defaults"><span class="type">ModulemdDefaults</span></a> object of the
1547+
index, an error will be reported and the index will be left in an undefined
1548+
state.</p>
15451549
<div class="refsect3">
15461550
<a name="modulemd-module-index-upgrade-defaults.parameters"></a><h4>Parameters</h4>
15471551
<div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1563,9 +1567,9 @@ <h2><span class="refentrytitle"><a name="modulemd-2.0-Modulemd.ModuleIndex.top_o
15631567
</tr>
15641568
<tr>
15651569
<td class="parameter_name"><p>error</p></td>
1566-
<td class="parameter_description"><p>A <a href="https://developer.gnome.org/glib/stable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> that contains information on why the index could
1567-
not be upgraded in the event of an error. </p></td>
1568-
<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
1570+
<td class="parameter_description"><p>A <a href="https://developer.gnome.org/glib/stable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> that contains information on why the
1571+
index could not be upgraded in the event of an error. </p></td>
1572+
<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td>
15691573
</tr>
15701574
</tbody>
15711575
</table></div>

0 commit comments

Comments
 (0)