diff --git a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/FunctionMethodPatternTests.java b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/FunctionMethodPatternTests.java
index a2c683d8664..160b078b23b 100644
--- a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/FunctionMethodPatternTests.java
+++ b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/FunctionMethodPatternTests.java
@@ -118,7 +118,7 @@ public class FunctionMethodPatternTests extends BaseSearchTest {
 		
 		search( workspace, pattern, scope, resultCollector );
 		matches = resultCollector.getSearchResults();
-		assertEquals( 2, matches.size());
+		assertEquals( 0, matches.size()); // The pattern must match the use of the void in the code
 		
 		pattern = SearchEngine.createSearchPattern( "turnAgain()", METHOD, DECLARATIONS, true ); //$NON-NLS-1$
 		
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexVisitorUtil.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexVisitorUtil.java
index 240f75aaa98..1e5948d1668 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexVisitorUtil.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexVisitorUtil.java
@@ -219,9 +219,8 @@ public class IndexVisitorUtil {
                 IType paramType = parameters[i].getType();
                 parameterList.add(ASTTypeUtil.getType(paramType).toCharArray());
             }
-            if (parameterList.isEmpty()) {
-                parameterList.add("void".toCharArray()); //$NON-NLS-1$
-            }
+            if (function.takesVarArgs())
+                parameterList.add("...".toCharArray()); //$NON-NLS-1$
         }
         catch (DOMException e) {
         }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java
index 00cde4cc4fd..c0ab071579c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java
@@ -125,7 +125,7 @@ public class DOMCompletionContributor implements ICompletionContributor {
 					
 					args.append(ASTTypeUtil.getType(paramType));
 					String paramName = params[i].getName();
-					if (paramName != null) {
+					if (paramName != null && paramName.length() > 0) {
 						args.append(' ');
 						args.append(paramName);
 					}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java
index 80fcd7e41f9..edf6c7c3aa5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java
@@ -15,7 +15,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.eclipse.cdt.core.dom.ast.ASTCompletionNode;
-import org.eclipse.cdt.core.dom.ast.DOMException;
 import org.eclipse.cdt.core.dom.ast.IASTFieldReference;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.model.ICElement;
@@ -40,6 +39,9 @@ public class SearchCompletionContributor implements ICompletionContributor {
 	{
 	    if (!validContext(completionNode))
             return;
+        
+        if (prefix == null || prefix.length() == 0)
+            return;
             
 		// Create search engine
 		SearchEngine searchEngine = new SearchEngine();