projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix shadow declaration and tag unused attribute
[apps/madmutt.git]
/
state.c
diff --git
a/state.c
b/state.c
index
12f3e99
..
1d41017
100644
(file)
--- a/
state.c
+++ b/
state.c
@@
-6,17
+6,13
@@
* It's licensed under the GNU General Public License,
* please see the file GPL in the top level source directory.
*/
* 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 "config.h"
-#endif
-#include <
std
lib.h>
-#include <stdio.h>
-#include <
stdarg
.h>
+#include <
lib-lib/lib-
lib.h>
+
+#include <
lib-mime/rfc3676
.h>
#include "mutt.h"
#include "state.h"
#include "mutt.h"
#include "state.h"
-#include "rfc3676.h"
static void state_prefix_put (const char *d, ssize_t dlen, STATE * s)
{
static void state_prefix_put (const char *d, ssize_t dlen, STATE * s)
{
@@
-35,7
+31,7
@@
void mutt_convert_to_state (iconv_t cd, char *bufi, ssize_t * l, STATE * s)
ssize_t ibl, obl;
if (!bufi) {
ssize_t ibl, obl;
if (!bufi) {
- if (cd !=
(iconv_t) (-1)
) {
+ if (cd !=
MUTT_ICONV_ERROR
) {
ob = bufo, obl = sizeof (bufo);
my_iconv(cd, 0, 0, &ob, &obl);
if (ob != bufo)
ob = bufo, obl = sizeof (bufo);
my_iconv(cd, 0, 0, &ob, &obl);
if (ob != bufo)
@@
-46,7
+42,7
@@
void mutt_convert_to_state (iconv_t cd, char *bufi, ssize_t * l, STATE * s)
return;
}
return;
}
- if (cd ==
(iconv_t) (-1)
) {
+ if (cd ==
MUTT_ICONV_ERROR
) {
state_prefix_put (bufi, *l, s);
*l = 0;
return;
state_prefix_put (bufi, *l, s);
*l = 0;
return;