- Patch #204900 by webernet: code style fixes. Likely my last patch of the year. Fiew. Thanks all, and see you on the other side. :)

6 files changed, 10 insertions, 18 deletions

diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index 2bb105161..a20486996 100644
--- a/includes/database.mysql.inc
+++ b/includes/database.mysql.inc
@@ -85,7 +85,7 @@ function db_connect($url) {
     _db_error_page(mysql_error());
   }
 
-  /* On MySQL 4.1 and later, force UTF-8 */
+  // On MySQL 4.1 and later, force UTF-8.
   if (version_compare(mysql_get_server_info(), '4.1.0', '>=')) {
     mysql_query('SET NAMES "utf8"', $connection);
   }
diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc
index d6fd3aeda..9cefafc6d 100644
--- a/includes/database.mysqli.inc
+++ b/includes/database.mysqli.inc
@@ -6,9 +6,8 @@
  * Database interface code for MySQL database servers using the mysqli client libraries. mysqli is included in PHP 5 by default and allows developers to use the advanced features of MySQL 4.1.x, 5.0.x and beyond.
  */
 
-/* Maintainers of this file should consult
- * http://www.php.net/manual/en/ref.mysqli.php
- */
+ // Maintainers of this file should consult:
+ // http://www.php.net/manual/en/ref.mysqli.php
 
 /**
  * @ingroup database
@@ -85,7 +84,7 @@ function db_connect($url) {
     _db_error_page(mysqli_connect_error());
   }
 
-  /* Force UTF-8 */
+  // Force UTF-8.
   mysqli_query($connection, 'SET NAMES "utf8"');
 
   return $connection;
diff --git a/includes/form.inc b/includes/form.inc
index 7b9d119e8..5ff0193fe 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -639,7 +639,7 @@ function _form_validate($elements, &$form_state, $form_id = NULL) {
       _form_validate($elements[$key], $form_state);
     }
   }
-  /* Validate the current input */
+  // Validate the current input.
   if (!isset($elements['#validated']) || !$elements['#validated']) {
     if (isset($elements['#needs_validation'])) {
       // An empty textfield returns '' so we use empty(). An empty checkbox
@@ -817,7 +817,7 @@ function form_builder($form_id, $form, &$form_state) {
   // Initialize as unprocessed.
   $form['#processed'] = FALSE;
 
-  /* Use element defaults */
+  // Use element defaults.
   if ((!empty($form['#type'])) && ($info = _element_info($form['#type']))) {
     // Overlay $info onto $form, retaining preexisting keys in $form.
     $form += $info;
@@ -1525,7 +1525,7 @@ function theme_password_confirm($element) {
   return theme('form_element', $element, $element['#children']);
 }
 
-/*
+/**
  * Expand a password_confirm field into two text boxes.
  */
 function expand_password_confirm($element) {
diff --git a/includes/theme.inc b/includes/theme.inc
index 0b75847bc..b9b1d2772 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -12,7 +12,7 @@
  * @see themeable
  */
 
- /**
+/**
  * @name Content markers
  * @{
  * Markers used by theme_mark() and node_mark() to designate content.
diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index 59210a459..38704bc4a 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -163,11 +163,9 @@ function xmlrpc_message_parse(&$xmlrpc_message) {
     return FALSE;
   }
   $xmlrpc_message->_parser = xml_parser_create();
-  // Set XML parser to take the case of tags into account
+  // Set XML parser to take the case of tags into account.
   xml_parser_set_option($xmlrpc_message->_parser, XML_OPTION_CASE_FOLDING, FALSE);
   // Set XML parser callback functions
-  /* Do not set object. $xmlrpc_message does not have member functions any more
-  xml_set_object($xmlrpc_message->_parser, $xmlrpc_message); */
   xml_set_element_handler($xmlrpc_message->_parser, 'xmlrpc_message_tag_open', 'xmlrpc_message_tag_close');
   xml_set_character_data_handler($xmlrpc_message->_parser, 'xmlrpc_message_cdata');
   xmlrpc_message_set($xmlrpc_message);
diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
index 9b455c639..11744a98e 100644
--- a/includes/xmlrpcs.inc
+++ b/includes/xmlrpcs.inc
@@ -201,12 +201,7 @@ function xmlrpc_server_call($xmlrpc_server, $methodname, $args) {
       }
     }
   }
-  /*
-  if (count($args) == 1) {
-    // If only one parameter just send that instead of the whole array
-    $args = $args[0];
-  }
-  */
+
   if (!function_exists($method)) {
     return xmlrpc_error(-32601, t('Server error. Requested function %method does not exist.', array("%method" => $method)));
   }