From 52753a9e15d24557179ceadbf356fdf6dce399a5 Mon Sep 17 00:00:00 2001
From: Kevin Easton <keaston@users.sourceforge.net>
Date: Tue, 17 May 2011 14:16:34 +0000
Subject: [PATCH] Further cleanups in the URL grabber - remove unnecessary
 globals, change url_list from extern to static.

git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@132 13b04d17-f746-0410-82c6-800466cd88b0
---
 source/commands2.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/source/commands2.c b/source/commands2.c
index 0c46ab2..822d7c2 100644
--- a/source/commands2.c
+++ b/source/commands2.c
@@ -1493,26 +1493,20 @@ int add = 0;
 	new_free(&buffer);
 }
 
-/*
- * Rewritten by David Walluck (DavidW2) Fri Mar 26 08:13:36 EST 1999 to use
- * linked lists and add /set MAX_URLS.
- */
-
-UrlList *url_list = NULL, 
-	*cur_url = NULL, 
-	*prev_url = NULL, 
-	*new_url = NULL;
+static UrlList *url_list = NULL;
 
 int grab_http(char *from, char *to, char *text) 
 {
 #ifdef PUBLIC_ACCESS
 	return 0;
 #else
-	static int count = 0;
-	int url_count = 0;
-	char *q = NULL;
 	if ((get_int_var(HTTP_GRAB_VAR) && stristr(text, "HTTP:")) || (get_int_var(FTP_GRAB_VAR) && (stristr(text, "FTP:") || stristr(text, "FTP."))))
 	{
+		static int count = 0;
+		int url_count = 0;
+		char *q = NULL;
+		UrlList *cur_url, *prev_url, *new_url;
+
 		malloc_sprintf(&q, "%s %s -- %s", from, to, text);
 
 		/* Look for end of the list, counting as we go */
@@ -1562,11 +1556,14 @@ BUILT_IN_COMMAND(url_grabber)
 	bitchsay("This command has been disabled on a public access system");
 	return 0;
 #else
-int do_display = 1;
+	int do_display = 1;
+
 	if (args && *args)
 	{
 		int i, q;
 		char *p;
+		UrlList *cur_url, *prev_url;
+
 		while ((p = next_arg(args, &args)))
 		{
 			if (!my_stricmp(p, "SAVE"))