[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11180-g0d2c073

[Michal Čihař]

The branch, master has been updated
       via  0d2c07306507cf10b75ebb5ee369e82c77bfa00b (commit)
       via  8aa62d4931a3c83d095f5b8dc180dda252ebcbc2 (commit)
       via  4c16ac5d060493dc2aa9cb91491ade140a16d203 (commit)
       via  625a35bd87037ace91b4534c5fc9482e021e4257 (commit)
      from  7986ea8f35c539699f279b3bbd7a9196822a096d (commit)


- Log -----------------------------------------------------------------
commit 0d2c07306507cf10b75ebb5ee369e82c77bfa00b
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 14:43:54 2011 +0200

    Add parameter types

commit 8aa62d4931a3c83d095f5b8dc180dda252ebcbc2
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 14:41:52 2011 +0200

    Minor fix in coding style

commit 4c16ac5d060493dc2aa9cb91491ade140a16d203
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 14:41:37 2011 +0200

    Missing references in doc block

commit 625a35bd87037ace91b4534c5fc9482e021e4257
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 14:40:46 2011 +0200

    Wrap some long lines

-----------------------------------------------------------------------

Summary of changes:
 libraries/server_synchronize.lib.php |   47 ++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 3a6a666..52232b8 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -15,9 +15,11 @@
  *
  * @param array $trg_tables              array of target database table names,
  * @param array $src_tables              array of source database table names,
- * @param array &$matching_tables        empty array passed by reference to save names of matching tables,
- * @param array &$uncommon_source_tables empty array passed by reference to save names of tables present in
- *                                       source database but absent from target database
+ * @param array &$matching_tables        empty array passed by reference to save
+ *                                       names of matching tables,
+ * @param array &$uncommon_source_tables empty array passed by reference to save
+ *                                       names of tables present in source database
+ *                                       but absent from target database
  */
 function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables)
 {
@@ -40,16 +42,17 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un
  * in target database but are absent from source database
  *
  * @param array $trg_tables              array of target database table names,
- * @param array $matching_tables         $matching tables array containing names of matching tables,
- * @param array &$uncommon_target_tables empty array passed by reference to save names of tables presnet in
- *                                       target database but absent from source database
+ * @param array $matching_tables         matching tables array containing names
+ *                                       of matching tables,
+ * @param array &$uncommon_target_tables empty array passed by reference to save
+ *                                       names of tables presnet in target database
+ *                                       but absent from source database
  */
 function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables)
 {
     for ($c=0; $c<sizeof($trg_tables); $c++) {
         $match = false;
-        for ($d=0; $d < sizeof($matching_tables); $d++)
-        {
+        for ($d=0; $d < sizeof($matching_tables); $d++) {
             if ($trg_tables[$c] === $matching_tables[$d]) {
                 $match=true;
             }
@@ -74,14 +77,14 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo
  * @param string  $trg_db                  name of target database
  * @param db_link $src_link                connection established with source server
  * @param db_link $trg_link                connection established with target server
- * @param array   $matching_table          array containing matching table names
+ * @param array   &$matching_table         array containing matching table names
  * @param array   &$matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table
- * @param array   $update_array            A three dimensional array passed by reference to
+ * @param array   &$update_array           A three dimensional array passed by reference to
  *                                         contain updates required for each matching table
- * @param array   $insert_array            A three dimensional array passed by reference to
+ * @param array   &$insert_array           A three dimensional array passed by reference to
  *                                         contain inserts required for each matching table
- * @param array   $delete_array            Unused
- * @param array   $fields_num              A two dimensional array passed by reference to
+ * @param array   &$delete_array           Unused
+ * @param array   &$fields_num             A two dimensional array passed by reference to
  *                                         contain number of fields for each matching table
  * @param array   $matching_table_index    Index of a table from $matching_table array
  * @param array   &$matching_tables_keys   A two dimensional array passed by reference to contain names of keys for each matching table
@@ -293,15 +296,15 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching
 /**
  * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table.
  *
- * @param  $delete_array          array containing rows that are to be deleted
- * @param  $matching_table        array containing matching table names
- * @param  $matching_table_index  index of a table from $matching_table array
- * @param  $trg_keys              array of target table keys
- * @param  $src_keys              array of source table keys
- * @param  $trg_db                name of target database
- * @param  $trg_link              connection established with target server
- * @param  $src_db                name of source database
- * @param  $src_link              connection established with source server
+ * @param array   &$delete_array        array containing rows that are to be deleted
+ * @param array   $matching_table       array containing matching table names
+ * @param int     $matching_table_index index of a table from $matching_table array
+ * @param array   $trg_keys             array of target table keys
+ * @param array   $src_keys             array of source table keys
+ * @param string  $trg_db               name of target database
+ * @param db_link $trg_link             connection established with target server
+ * @param string  $src_db               name of source database
+ * @param db_link $src_link             connection established with source server
  */
 function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link)
 {


hooks/post-receive
-- 
phpMyAdmin