cvs: ZendAPI / Extending_Zend_ApiMacros.xml Extending_Zend_Arguments.xml Extending_Zend_Layout.xml Extending_Zend_Overview.xml
Extending_Zend_Possibilities.xml Extending_Zend_Printing.xml Extending_Zend_Using.xml

hholzgra Sun Mar 24 21:23:51 2002 EDT Modified files: /ZendAPI Extending_Zend_ApiMacros.xml Extending_Zend_Arguments.xml Extending_Zend_Layout.xml Extending_Zend_Overview.xml Extending_Zend_Possibilities.xml Extending_Zend_Printing.xml Extending_Zend_Using.xml Log: getting rid of hard-coded numbers, part 1

Index: ZendAPI/Extending_Zend_ApiMacros.xml diff -u ZendAPI/Extending_Zend_ApiMacros.xml:1.6 ZendAPI/Extending_Zend_ApiMacros.xml:1.7 --- ZendAPI/Extending_Zend_ApiMacros.xml:1.6 Mon Feb 11 05:10:33 2002 +++ ZendAPI/Extending_Zend_ApiMacros.xml Sun Mar 24 21:23:50 2002 @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> - <!-- $Revision: 1.6 $ --> + <!-- $Revision: 1.7 $ --> <chapter id="zend.api-macros"> <title>API Macros</title> <para>A set of macros was introduced into Zend's API that simplify access to <envar>zval</envar> - containers (see Table 9.19).</para> + containers (see <xref linkend='tab.api-macros'/>).</para> - <figure> - <title>Table 9.19. API Macros for Accessing <envar>zval</envar> Containers</title> - <informaltable> + <table id="tab.api-macros"> + <title>API Macros for Accessing <envar>zval</envar> Containers</title> <tgroup cols="2"> <colspec colnum="1" colname="col1" colwidth="*"/> <colspec colnum="2" colname="col2" colwidth="*"/> @@ -78,8 +77,7 @@ </row> </tbody> </tgroup> - </informaltable> - </figure> + </table> </chapter> <!-- vim600: syn=xml fen fdm=syntax fdl=2 si et tw=70 shiftwidth=1 Index: ZendAPI/Extending_Zend_Arguments.xml diff -u ZendAPI/Extending_Zend_Arguments.xml:1.7 ZendAPI/Extending_Zend_Arguments.xml:1.8 --- ZendAPI/Extending_Zend_Arguments.xml:1.7 Mon Feb 11 05:10:33 2002 +++ ZendAPI/Extending_Zend_Arguments.xml Sun Mar 24 21:23:50 2002 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> - <!-- $Revision: 1.7 $ --> + <!-- $Revision: 1.8 $ --> <chapter id="zend.arguments"> <title>Accepting Arguments</title> <para> @@ -49,10 +49,10 @@ If the function is not called with two arguments, it exits with an error message. The code snippet above makes use of the tool macro <literal>WRONG_PARAM_COUNT</literal>, - which can be used to generate a standard error message (see Figure 9.4). + which can be used to generate a standard error message (see <xref linkend='fig.wrong-param-count'/>). </para> - <figure> - <title>Figure 9.4. <literal>WRONG_PARAM_COUNT</literal> in action.</title> + <figure id='fig.wrong-param-count'> + <title><literal>WRONG_PARAM_COUNT</literal> in action.</title> <graphic fileref="figures/Extending_Zend_3_wrong_parameter_count.png"/> </figure> <para> @@ -420,13 +420,13 @@ <para> A very clever implementation of this can be found in the code handling PHP's <function>fsockopen</function> located in - <filename>ext/standard/fsock.c</filename>, as shown in Listing - 9.7. Don't worry if you don't know all the functions used in this + <filename>ext/standard/fsock.c</filename>, as shown in + <xref linkend='example.fsockopen'/>. Don't worry if you don't know all the functions used in this source yet; we'll get to them shortly. </para> - <figure> - <title>Listing 9.7. PHP's implementation of variable arguments in fsockopen().</title> + <example id='example.fsockopen'> + <title>PHP's implementation of variable arguments in fsockopen().</title> <programlisting> <![CDATA[ pval **args[5]; @@ -476,7 +476,7 @@ key = emalloc(Z_STRLEN_P(args[0]) + 10); ]]> </programlisting> - </figure> + </example> <para> <function>fsockopen</function> accepts two, three, four, or five parameters. After the obligatory variable declarations, the @@ -511,15 +511,14 @@ <para> To work around this, you have to use a set of API functions to force a type conversion on every argument that's being passed (see - Table 9.4). + <xref linkend='tab.arg-conv'/>). </para> <para> <emphasis>Note:</emphasis> All conversion functions expect a <envar>**zval</envar> as parameter. </para> - <figure> - <title>Table 9.4. Argument Conversion Functions</title> - <informaltable> + <table id='tab.arg-conv'> + <title>Argument Conversion Functions</title> <tgroup cols="2"> <colspec colnum="1" colname="col1" colwidth="1.02*"/> <colspec colnum="2" colname="col2" colwidth="1.00*"/> @@ -607,17 +606,16 @@ </row> </tbody> </tgroup> - </informaltable> - </figure> + </table> <note> <para> You can find a demonstration of the behavior in <filename>cross_conversion.php</filename> on the accompanying - CD-ROM. Figure 9.5 shows the output. + CD-ROM. <xref linkend='fig.cross-convert'/> shows the output. </para> </note> - <figure> - <title>Figure 9.5. Cross-conversion behavior of PHP.</title> + <figure id='fig.cross-convert'> + <title>Cross-conversion behavior of PHP.</title> <graphic fileref="figures/Extending_Zend_4_cross_converter.png"/> </figure> <para> @@ -648,10 +646,10 @@ After retrieving the parameter pointer, the parameter value is converted to a long (an integer), which also forms the return value of this function. Understanding access to the contents of the value requires a - short discussion of the <envar>zval</envar> type, whose definition is shown in Listing 9.8. + short discussion of the <envar>zval</envar> type, whose definition is shown in <xref linkend='example.zval-typedef'/>. </para> - <figure> + <example id='example.zval-typedef'> <title>Listing 9.8. PHP/Zend <envar>zval</envar> type definition.</title> <programlisting> <![CDATA[ @@ -682,7 +680,7 @@ }; ]]> </programlisting> - </figure> + </example> <para> Actually, <envar>pval</envar> (defined in <filename>php.h</filename>) is only an alias of <envar>zval</envar> (defined in <filename>zend.h</filename>), Index: ZendAPI/Extending_Zend_Layout.xml diff -u ZendAPI/Extending_Zend_Layout.xml:1.6 ZendAPI/Extending_Zend_Layout.xml:1.7 --- ZendAPI/Extending_Zend_Layout.xml:1.6 Mon Feb 11 05:10:33 2002 +++ ZendAPI/Extending_Zend_Layout.xml Sun Mar 24 21:23:50 2002 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> - <!-- $Revision: 1.6 $ --> + <!-- $Revision: 1.7 $ --> <chapter id="zend.layout"> <title>Source Layout</title> @@ -26,10 +26,10 @@ debug extensions. </para> <para> - After extracting the PHP archive, you'll see a directory layout similar to that in Figure 9.2. + After extracting the PHP archive, you'll see a directory layout similar to that in <xref linkend='fig.dir-layout'/>. </para> - <figure> - <title>Figure 9.2. Main directory layout of the PHP source tree.</title> + <figure id='fig.dir-layout'> + <title>Main directory layout of the PHP source tree.</title> <graphic fileref="figures/Extending_Zend_1a_Directory_Layout.png"/> </figure> <para> Index: ZendAPI/Extending_Zend_Overview.xml diff -u ZendAPI/Extending_Zend_Overview.xml:1.5 ZendAPI/Extending_Zend_Overview.xml:1.6 --- ZendAPI/Extending_Zend_Overview.xml:1.5 Mon Feb 11 05:10:33 2002 +++ ZendAPI/Extending_Zend_Overview.xml Sun Mar 24 21:23:50 2002 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> - <!-- $Revision: 1.5 $ --> + <!-- $Revision: 1.6 $ --> <chapter id="zend.overview"> <title>Overview</title> @@ -38,7 +38,7 @@ PHP's core. The term <emphasis>PHP</emphasis> refers to the complete system as it appears from the outside. This might sound a bit confusing at first, but it's not that complicated (see - Figure 9.1). To implement a Web script interpreter, you need + <xref linkend='fig.internal-struct'/>). To implement a Web script interpreter, you need three parts: <orderedlist> <listitem> @@ -66,8 +66,8 @@ basics with some predefined functions. PHP contains all the modules that actually create the language's outstanding capabilities. - <figure> - <title>Figure 9.1. The internal structure of PHP.</title> + <figure id='fig.internal-struct'> + <title>The internal structure of PHP.</title> <graphic fileref="figures/Extending_Zend_1_PHPs_internal_structure.png"/> </figure> </para> Index: ZendAPI/Extending_Zend_Possibilities.xml diff -u ZendAPI/Extending_Zend_Possibilities.xml:1.6 ZendAPI/Extending_Zend_Possibilities.xml:1.7 --- ZendAPI/Extending_Zend_Possibilities.xml:1.6 Mon Feb 11 05:10:33 2002 +++ ZendAPI/Extending_Zend_Possibilities.xml Sun Mar 24 21:23:50 2002 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> - <!-- $Revision: 1.6 $ --> + <!-- $Revision: 1.7 $ --> <chapter id="zend.possibilities"> <title>Extension Possibilities</title> <para> - As shown in Figure 9.1 above, PHP can be extended primarily at + As shown in <xref linkend='fig.internal-struct'/> above, PHP can be extended primarily at three points: external modules, built-in modules, and the Zend engine. The following sections discuss these options. </para> Index: ZendAPI/Extending_Zend_Printing.xml diff -u ZendAPI/Extending_Zend_Printing.xml:1.8 ZendAPI/Extending_Zend_Printing.xml:1.9 --- ZendAPI/Extending_Zend_Printing.xml:1.8 Sun Feb 24 01:41:30 2002 +++ ZendAPI/Extending_Zend_Printing.xml Sun Mar 24 21:23:50 2002 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> - <!-- $Revision: 1.8 $ --> + <!-- $Revision: 1.9 $ --> <chapter id="zend.printing"> <title>Printing Information</title> <para> @@ -25,7 +25,7 @@ <function>zend_error</function> can be used to generate error messages. This function accepts two arguments; the first is the error type (see <filename>zend_errors.h</filename>), and the second is the error message. - <programlisting>zend_error(E_WARNING, "This function has been called with empty arguments");</programlisting>Table 9.16 shows a list of possible values (see Figure 9.8). These + <programlisting>zend_error(E_WARNING, "This function has been called with empty arguments");</programlisting>Table 9.16 shows a list of possible values (see <xref linkend='fig.warning-messages'/>). These values are also referred to in <filename>php.ini</filename>. Depending on which error type you choose, your messages will be logged. <figure> @@ -91,8 +91,8 @@ </tgroup> </informaltable> </figure> - <figure> - <title>Figure 9.8. Display of warning messages in the browser.</title> + <figure id='fig.warning-messages'> + <title>Display of warning messages in the browser.</title> <graphic fileref="figures/Extending_Zend_7_warning_messages.png"/> </figure></para> </section> Index: ZendAPI/Extending_Zend_Using.xml diff -u ZendAPI/Extending_Zend_Using.xml:1.6 ZendAPI/Extending_Zend_Using.xml:1.7 --- ZendAPI/Extending_Zend_Using.xml:1.6 Mon Feb 11 05:10:33 2002 +++ ZendAPI/Extending_Zend_Using.xml Sun Mar 24 21:23:50 2002 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> - <!-- $Revision: 1.6 $ --> + <!-- $Revision: 1.7 $ --> <chapter id="zend.using"> <title>Using Extensions</title> <para> @@ -41,9 +41,9 @@ </figure> <para> Calling this PHP file in your Web browser should give you the - output shown in Figure 9.3. - <figure> - <title>Figure 9.3. Output of first_module.php.</title> + output shown in <xref linkend='fig.out-first'/>. + <figure id='fig.out-first'> + <title>Output of first_module.php.</title> <graphic fileref="figures/Extending_Zend_2_firstmod_output.png"/> </figure> </para>