projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation warnings
[apps/madmutt.git]
/
mutt_idna.c
diff --git
a/mutt_idna.c
b/mutt_idna.c
index
bab9f8f
..
1a9bd8b
100644
(file)
--- a/
mutt_idna.c
+++ b/
mutt_idna.c
@@
-7,15
+7,11
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
#include "mutt.h"
#include "charset.h"
#include "mutt.h"
#include "charset.h"
@@
-25,7
+21,7
@@
#ifndef HAVE_LIBIDN
#ifndef HAVE_LIBIDN
-int mutt_idna_to_local (const char *in, char **out, int flags)
+int mutt_idna_to_local (const char *in, char **out, int flags
__attribute__ ((unused))
)
{
*out = m_strdup(in);
return 1;
{
*out = m_strdup(in);
return 1;
@@
-70,7
+66,6
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
if (!irrev && ascii_strcasecmp (t2, in)) {
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
if (!irrev && ascii_strcasecmp (t2, in)) {
- debug_print (1, ("not reversible. in = '%s', t2 = '%s'.\n", in, t2));
irrev = 1;
}
irrev = 1;
}
@@
-134,7
+129,7
@@
static int mbox_to_udomain (const char *mbx, char **user, char **domain)
return 0;
}
return 0;
}
-int mutt_addrlist_to_idna (address_t * a, c
onst c
har **err)
+int mutt_addrlist_to_idna (address_t * a, char **err)
{
char *user = NULL, *domain = NULL;
char *tmp = NULL;
{
char *user = NULL, *domain = NULL;
char *tmp = NULL;
@@
-156,7
+151,7
@@
int mutt_addrlist_to_idna (address_t * a, const char **err)
}
else {
p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
}
else {
p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
- sprintf
(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+ sprintf
(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
}
p_delete(&domain);
}
p_delete(&domain);
@@
-183,7
+178,7
@@
int mutt_addrlist_to_local (address_t * a)
if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
- sprintf
(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+ sprintf
(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
}
p_delete(&domain);
}
p_delete(&domain);
@@
-217,7
+212,7
@@
const char *mutt_addr_for_display (address_t * a)
}
p_realloc(&buff, m_strlen(tmp) + m_strlen(user) + 2);
}
p_realloc(&buff, m_strlen(tmp) + m_strlen(user) + 2);
- sprintf
(buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+ sprintf
(buff, "%s@%s", NONULL (user), NONULL (tmp));
p_delete(&tmp);
p_delete(&user);
p_delete(&domain);
p_delete(&tmp);
p_delete(&user);
p_delete(&domain);
@@
-247,7
+242,7
@@
void mutt_env_to_local (ENVELOPE * e)
if (tag) *tag = #a; e = 1; err = NULL; \
}
if (tag) *tag = #a; e = 1; err = NULL; \
}
-int mutt_env_to_idna (ENVELOPE * env, const char **tag, c
onst c
har **err)
+int mutt_env_to_idna (ENVELOPE * env, const char **tag, char **err)
{
int e = 0;
{
int e = 0;