[PHP-DOC] cvs: phpdoc /ja/appendices migration4.xml phpdevel.xml

[Masaki Fujimoto]

fujimoto                Tue Dec 11 17:13:32 2001 EDT

  Modified files:              
    /phpdoc/ja/appendices       migration4.xml phpdevel.xml 
  Log:
  fixed escaped characters in CDATA section.
  
  
Index: phpdoc/ja/appendices/migration4.xml
diff -u phpdoc/ja/appendices/migration4.xml:1.8 phpdoc/ja/appendices/migration4.xml:1.9
--- phpdoc/ja/appendices/migration4.xml:1.8     Mon Dec 10 10:16:33 2001
+++ phpdoc/ja/appendices/migration4.xml Tue Dec 11 17:13:32 2001
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
  <appendix id="migration4">
   <title>PHP 3.0からPHP 4.0への移行</title>
        
@@ -74,8 +74,8 @@
     <informalexample>
      <programlisting role="apache">
 <![CDATA[
-application/x-httpd-php3        --&gt;    application/x-httpd-php
-application/x-httpd-php3-source --&gt;    application/x-httpd-php-source
+application/x-httpd-php3        -->    application/x-httpd-php
+application/x-httpd-php3-source -->    application/x-httpd-php-source
 ]]>
      </programlisting>
     </informalexample>
Index: phpdoc/ja/appendices/phpdevel.xml
diff -u phpdoc/ja/appendices/phpdevel.xml:1.8 phpdoc/ja/appendices/phpdevel.xml:1.9
--- phpdoc/ja/appendices/phpdevel.xml:1.8       Mon Dec 10 10:16:33 2001
+++ phpdoc/ja/appendices/phpdevel.xml   Tue Dec 11 17:13:32 2001
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <appendix id="phpdevel">
  <title>PHP の開発</title>
 
@@ -36,7 +36,7 @@
       <programlisting role="c">
 <![CDATA[
 pval *arg1, *arg2;
-if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&amp;arg1,&amp;arg2)==FAILURE) {
+if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&arg1,&arg2)==FAILURE) {
    WRONG_PARAM_COUNT;
 }
 ]]>
@@ -83,7 +83,7 @@
 int arg_count = ARG_COUNT(ht);
  
 if (arg_count &lt; 2 || arg_count &gt; 3 ||
-    getParameters(ht,arg_count,&amp;arg1,&amp;arg2,&amp;arg3)==FAILURE) {
+    getParameters(ht,arg_count,&arg1,&arg2,&arg3)==FAILURE) {
     WRONG_PARAM_COUNT;
 }
 ]]>
@@ -278,7 +278,7 @@
       <title>シンボルテーブルにある変数のサイズの調べ方</title>
       <programlisting role="c">
 <![CDATA[
-hash_find(active_symbol_table,"foo",sizeof("foo"),&amp;pvalue);
+hash_find(active_symbol_table,"foo",sizeof("foo"),&pvalue);
 check(pvalue.type);
 ]]>
       </programlisting>
@@ -307,8 +307,8 @@
 <![CDATA[
 pval arr;
    
-if (array_init(&amp;arr) == FAILURE) { failed... };
-hash_update(active_symbol_table,"foo",sizeof("foo"),&amp;arr,sizeof(pval),NULL);
+if (array_init(&arr) == FAILURE) { failed... };
+hash_update(active_symbol_table,"foo",sizeof("foo"),&arr,sizeof(pval),NULL);
 ]]>
       </programlisting>
      </example>
@@ -329,15 +329,15 @@
 entry.value.lval = 5;
    
 /* $foo["bar"] = 5 を定義する */
-hash_update(arr.value.ht,"bar",sizeof("bar"),&amp;entry,sizeof(pval),NULL); 
+hash_update(arr.value.ht,"bar",sizeof("bar"),&entry,sizeof(pval),NULL); 
  
 /* $foo[7] = 5 を定義する */
-hash_index_update(arr.value.ht,7,&amp;entry,sizeof(pval),NULL); 
+hash_index_update(arr.value.ht,7,&entry,sizeof(pval),NULL); 
  
 /* $foo[] における次の空きメモリー、つまり $foo[8] を 5 
に定義する
  * (php2 と同様に動作します)
  */
-hash_next_index_insert(arr.value.ht,&amp;entry,sizeof(pval),NULL); 
+hash_next_index_insert(arr.value.ht,&entry,sizeof(pval),NULL); 
 ]]>
       </programlisting>
      </example>
@@ -382,8 +382,8 @@
 <![CDATA[
 pval *arr;
    
-if (hash_find(active_symbol_table,"foo",sizeof("foo"),(void **)&amp;arr)==FAILURE) { 
can't find... }
-else { use arr-&gt;value.ht... }
+if (hash_find(active_symbol_table,"foo",sizeof("foo"),(void **)&arr)==FAILURE) { 
+can't find... }
+else { use arr->value.ht... }
 ]]>
      </programlisting>
     </para>
@@ -581,8 +581,8 @@
  
 /* ...リソース用のメモリを確保し、リソースを獲得します... */
 /* 新規のリソースをリストに追加します */
-return_value-&gt;value.lval = php3_list_insert((void *) resource, LE_RESOURCE_TYPE);
-return_value-&gt;type = IS_LONG;
+return_value->value.lval = php3_list_insert((void *) resource, LE_RESOURCE_TYPE);
+return_value->type = IS_LONG;
 ]]>
       </programlisting>
      </example>
@@ -596,9 +596,9 @@
 int type;
  
 convert_to_long(resource_id);
-resource = php3_list_find(resource_id-&gt;value.lval, &amp;type);
+resource = php3_list_find(resource_id->value.lval, &type);
 if (type != LE_RESOURCE_TYPE) {
-php3_error(E_WARNING,"resource index %d has the wrong 
type",resource_id-&gt;value.lval);
+php3_error(E_WARNING,"resource index %d has the wrong type",resource_id->value.lval);
        RETURN_FALSE;
 }
 /* ...リソースを使用します... */
@@ -615,7 +615,7 @@
 int type;
  
 convert_to_long(resource_id);
-php3_list_delete(resource_id-&gt;value.lval);
+php3_list_delete(resource_id->value.lval);
 ]]>
       </programlisting>
      </example>