/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
*/
#if HAVE_CONFIG_H
#include "mutt_ssl.h"
#endif
-
-
#include "mx.h"
#include "init.h"
#include "mailbox.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
* the template, and leaving t pointed at the current item.
*/
t = last;
- safe_free (&t->template);
+ FREE(t->template);
break;
}
if (!last->next)
if (spam->rx && !mutt_strcmp (spam->rx->pattern, pat)) {
*list = spam->next;
mutt_free_regexp (&spam->rx);
- safe_free (&spam->template);
- safe_free (&spam);
+ FREE(&spam->template);
+ FREE(&spam);
return 1;
}
if (!mutt_strcmp (spam->rx->pattern, pat)) {
prev->next = spam->next;
mutt_free_regexp (&spam->rx);
- safe_free (&spam->template);
- safe_free (&spam);
+ FREE(spam->template);
+ FREE(spam);
spam = prev->next;
++nremoved;
}
if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
buffer[0] = '\0';
fgets (buffer, sizeof (buffer), f);
- p = &buffer;
+ p = (char*) &buffer;
SKIPWS (p);
i = p;
while (*i && (*i != ' ') && (*i != '\t') && (*i != '\r')