coding style fixes (part 2) [#471142]

Miscellaneous coding style fixes:

Changes null, true and false to upper case
Changes while (...) {} (on one line) to while (...);
Removes a closing ?> at end of the file
Changes if (..) {...} in template files to if (...): ... endif;

Cheers,
Stella

Comment	File	Size	Author
#3	coding_style_misc.patch	9.35 KB	stella
#3
	coding_style_misc.patch	10.78 KB	stella

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

agentrickard

he/him

English

Georgia (US)

CreditAttribution: agentrickard commented 23 May 2009 at 22:11

I will RTBC this if it passes the bot.

However, reading the patch suggests to me that drupal_truncate_bytes needs a small refactor for clarity. The while line corrected by this patch is clear as mud.

Here's the full function (as patched):

function drupal_truncate_bytes($string, $len) {
  if (strlen($string) <= $len) {
    return $string;
  }
  if ((ord($string[$len]) < 0x80) || (ord($string[$len]) >= 0xC0)) {
    return substr($string, 0, $len);
  }
  while (--$len >= 0 && ord($string[$len]) >= 0x80 && ord($string[$len]) < 0xC0);
  return substr($string, 0, $len);
}

I cannot tell from reading the code what that second while statement actually _does_.

Comment #2

agentrickard

he/him

English

Georgia (US)

CreditAttribution: agentrickard commented 23 May 2009 at 22:30

Status:

Needs review

» Reviewed & tested by the community

As promised.

Comment #3

stella CreditAttribution: stella commented 23 May 2009 at 23:06

Status:

Reviewed & tested by the community

» Needs review

File	Size
coding_style_misc.patch	9.35 KB

Re-rolled version, added in comment to clarify the while (...); line in unicode.inc. Also removed the endif; changes to the two tpl.php files - will open a separate issue for those.