Removed NICKMAX and CHANMAX, replaced user->nick, c->name, and ci->name with std::string

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2732 5417fbe8-f217-4b02-8779-1006273d7864

4 files changed, 8 insertions, 19 deletions

diff --git a/include/config.h b/include/config.h
index a5151e071..c6a0cb9d2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -50,17 +50,6 @@
  * unusable. 
  */
 
-/* Maximum length of a channel name, including the trailing null.  Any
- * channels with a length longer than (CHANMAX-1) including the leading #
- * will not be usable with ChanServ. */
-#define CHANMAX		64
-
-/* Maximum length of a nickname, including the trailing null.  This MUST be
- * at least one greater than the maximum allowable nickname length on your
- * network, or people will run into problems using Services!  The default
- * (32) works with all servers I know of. */
-#define NICKMAX		32
-
 /* Maximum length of a password */
 #define PASSMAX		32
 
diff --git a/include/regchannel.h b/include/regchannel.h
index 8a906c818..a6275db1d 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -80,7 +80,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag>
 	~ChannelInfo();
 
 	ChannelInfo *next, *prev;
-	char name[CHANMAX];
+	std::string name;		/* Channel name */
 	NickCore *founder;
 	NickCore *successor;		/* Who gets the channel if the founder
 					 			 * nick is dropped or expires */
@@ -91,7 +91,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag>
 	time_t time_registered;
 	time_t last_used;
 	char *last_topic;			/* Last topic on the channel */
-	char last_topic_setter[NICKMAX];	/* Who set the last topic */
+	std::string last_topic_setter;			/* Who set the last topic */
 	time_t last_topic_time;		/* When the last topic was set */
 
 	char *forbidby;
diff --git a/include/services.h b/include/services.h
index 9393c9091..0465fa631 100644
--- a/include/services.h
+++ b/include/services.h
@@ -495,7 +495,7 @@ class Memo : public Flags<MemoFlag>
  public:
 	uint32 number;	/* Index number -- not necessarily array position! */
 	time_t time;	/* When it was sent */
-	char sender[NICKMAX];
+	std::string sender;
 	char *text;
 };
 
@@ -854,11 +854,11 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlags>
 	~Channel();
 
 	Channel *next, *prev;
-	char name[CHANMAX];
+	std::string name;		/* Channel name */
 	ChannelInfo *ci;			/* Corresponding ChannelInfo */
 	time_t creation_time;		/* When channel was created */
 	char *topic;
-	char topic_setter[NICKMAX];		/* Who set the topic */
+	std::string topic_setter;
 	time_t topic_time;			/* When topic was set */
 	std::bitset<128> modes;
 
@@ -1055,7 +1055,7 @@ struct NewsItem
 	NewsType type;
 	uint32 num;
 	std::string Text;
-	char who[NICKMAX];
+	std::string who;
 	time_t time;
 };
 
@@ -1101,7 +1101,7 @@ struct sxline_ {
 struct exception_ {
 	char *mask;				 /* Hosts to which this exception applies */
 	int limit;				  /* Session limit for exception */
-	char who[NICKMAX];		  /* Nick of person who added the exception */
+	std::string who;		/* Nick of person who added the exception */
 	char *reason;			   /* Reason for exception's addition */
 	time_t time;				/* When this exception was added */
 	time_t expires;			 /* Time when it expires. 0 == no expiry */
diff --git a/include/users.h b/include/users.h
index 3733609ac..0d702bb19 100644
--- a/include/users.h
+++ b/include/users.h
@@ -29,7 +29,7 @@ class CoreExport User : public Extensible
  public: // XXX: exposing a tiny bit too much
 	User *next, *prev;
 
-	char nick[NICKMAX];
+	std::string nick;	/* User's current nick */
 
 	char *host;		/* User's real hostname 	*/
 	char *hostip;		/* User's IP number			 */