You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/07/06 20:27:30 UTC
svn commit: r1358337 - /subversion/trunk/subversion/svn/file-merge.c
Author: stsp
Date: Fri Jul 6 18:27:30 2012
New Revision: 1358337
URL: http://svn.apache.org/viewvc?rev=1358337&view=rev
Log:
* subversion/svn/file-merge.c
(get_term_width): Put braces around a multi-line if statement body.
Also fix some whitespace mis-formatting.
Modified:
subversion/trunk/subversion/svn/file-merge.c
Modified: subversion/trunk/subversion/svn/file-merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1358337&r1=1358336&r2=1358337&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Fri Jul 6 18:27:30 2012
@@ -295,9 +295,11 @@ get_term_width(void)
struct winsize ws;
if (ioctl(fd, TIOCGWINSZ, &ws) != -1)
- if (ws.ws_col < 80)
- return 80;
- return ws.ws_col;
+ {
+ if (ws.ws_col < 80)
+ return 80;
+ return ws.ws_col;
+ }
}
#endif
columns_env = getenv("COLUMNS");
@@ -312,10 +314,10 @@ get_term_width(void)
svn_error_clear(err);
return 80;
}
+
if (cols < 80)
return 80;
return cols;
-
}
else
return 80;