[asterisk-commits] jrose: trunk r375175 - /trunk/main/manager.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Wed Oct 17 15:34:40 2012
New Revision: 375175

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375175
Log:
manager: remove curses dependent stuff from r375103

Upon further examination, this code was causing compliation problems on
CentOS at the least (possibly on any machine without curses) and also
the local value of COLS is used even with a remote console, so it is
less than ideal.

(issue ASTERISK-20396)
Reported by: Johan Wilfer

Modified:
    trunk/main/manager.c

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=375175&r1=375174&r2=375175
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Oct 17 15:34:40 2012
@@ -88,10 +88,6 @@
 #include "asterisk/aoc.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/presencestate.h"
-
-#ifdef HAVE_CURSES
-#include <curses.h>
-#endif
 
 /*** DOCUMENTATION
 	<manager name="Ping" language="en_US">
@@ -1838,11 +1834,7 @@
 		}
 	}
 
-#ifdef HAVE_CURSES
-	space_remaining = COLS - name_len - 4;
-#else
 	space_remaining = MGR_SHOW_TERMINAL_WIDTH - name_len - 4;
-#endif
 	if (space_remaining < 0) {
 		space_remaining = 0;
 	}