[asterisk-commits] dbrooks: branch 1.6.0 r191137 - in /branches/1.6.0: ./ pbx/pbx_config.c

[SVN commits to the Asterisk project]

Author: dbrooks
Date: Wed Apr 29 13:39:14 2009
New Revision: 191137

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=191137
Log:
Merged revisions 191136 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r191136 | dbrooks | 2009-04-29 13:32:58 -0500 (Wed, 29 Apr 2009) | 3 lines
  
  Removing crufty code that is no longer necessary. Code cleanup.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/pbx/pbx_config.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/pbx/pbx_config.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/pbx/pbx_config.c?view=diff&rev=191137&r1=191136&r2=191137
==============================================================================
--- branches/1.6.0/pbx/pbx_config.c (original)
+++ branches/1.6.0/pbx/pbx_config.c Wed Apr 29 13:39:14 2009
@@ -388,70 +388,10 @@
 	return ret;
 }
 
-#define BROKEN_READLINE 1
-
-#ifdef BROKEN_READLINE
-/*
- * There is one funny thing, when you have word like 300@ and you hit
- * <tab>, you arguments will act as your word is '300 ', so the '@'
- * character acts sometimes as a word delimiter and sometimes as a part
- * of a word.
- *
- * This fix function allocates a new word variable and stores it every
- * time as xxx at yyy. The correct pos is set, too.
- *
- * It's ugly, I know, but I'm waiting for Mark's suggestion if the
- * previous is a bug or a feature ...
- */
-static int fix_complete_args(const char *line, char **word, int *pos)
-{
-	char *_line, *_strsep_line, *_previous_word = NULL, *_word = NULL;
-	int words = 0;
-
-	_line = strdup(line);
-
-	_strsep_line = _line;
-	while (_strsep_line) {
-		_previous_word = _word;
-		_word = strsep(&_strsep_line, " ");
-
-		if (_word && strlen(_word)) words++;
-	}
-
-
-	if (_word || _previous_word) {
-		if (_word) {
-			if (!strlen(_word)) words++;
-			*word = strdup(_word);
-		} else
-			*word = strdup(_previous_word);
-		*pos = words - 1;
-		free(_line);
-		return 0;
-	}
-
-	free(_line);
-	return -1;
-}
-#endif /* BROKEN_READLINE */
-
 static char *complete_dialplan_remove_extension(struct ast_cli_args *a)
 {
 	char *ret = NULL;
 	int which = 0;
-
-#ifdef BROKEN_READLINE
-	char *word2;
-	/*
-	 * Fix arguments, *word is a new allocated structure, REMEMBER to
-	 * free *word when you want to return from this function ...
-	 */
-	if (fix_complete_args(a->line, &word2, &a->pos)) {
-		ast_log(LOG_ERROR, "Out of free memory\n");
-		return NULL;
-	}
-	a->word = word2;
-#endif
 
 	if (a->pos == 3) { /* 'dialplan remove extension _X_' (exten at context ... */
 		struct ast_context *c = NULL;
@@ -462,9 +402,6 @@
 
 		lc = split_ec(a->word, &exten, &context, &cid);
 		if (lc)	{ /* error */
-#ifdef BROKEN_READLINE
-			free(word2);
-#endif
 			return NULL;
 		}
 		le = strlen(exten);
@@ -574,9 +511,6 @@
 		if (exten)
 			free(exten);
 	}
-#ifdef BROKEN_READLINE
-	free(word2);
-#endif
 	return ret; 
 }