move buffer.[hc] into lib-lib/

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/Makefile.am b/Makefile.am
index 4d95024..afee72e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,7 @@ BUILT_SOURCES = keymap_defs.h version.h
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \

-       alias.c attach.c \
-       base64.c buffer.c browser.c buffy.c \
+       alias.c attach.c base64.c browser.c buffy.c \

        charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
        compose.c copy.c curs_lib.c curs_main.c crypt-mod.c crypt-mod.h \
        date.c \
        charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
        compose.c copy.c curs_lib.c curs_main.c crypt-mod.c crypt-mod.h \
        date.c \


@@ -81,8 +80,7 @@ EXTRA_muttng_SOURCES = \
        account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
        mutt_tunnel.c smime.c pgp.c pgpinvoke.c pgpkey.c \
        pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
        account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
        mutt_tunnel.c smime.c pgp.c pgpinvoke.c pgpkey.c \
        pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \

-       alias.h \
-       buffer.h browser.h \
+       alias.h browser.h \

        enter.h \
        list.h \
        mbyte.h remailer.h url.h state.h \
        enter.h \
        list.h \
        mbyte.h remailer.h url.h state.h \


@@ -93,7 +91,7 @@ EXTRA_muttng_SOURCES = \
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        configure acconfig.h \
        account.h alias.h attach.h recvattach.h handler.h thread.h \
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        configure acconfig.h \
        account.h alias.h attach.h recvattach.h handler.h thread.h \

-       buffer.h buffy.h \
+       buffy.h \

        charset.h compress.h copy.h crypthash.h \
        dotlock.h functions.h gen_defs \
        enter.h recvattach.h handler.h thread.h \
        charset.h compress.h copy.h crypthash.h \
        dotlock.h functions.h gen_defs \
        enter.h recvattach.h handler.h thread.h \

diff --git a/buffy.c b/buffy.c
index 11e2b0d..99a746d 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -15,11 +15,11 @@
 #endif
 
 #include <lib-lib/mem.h>
 #endif
 
 #include <lib-lib/mem.h>

+#include <lib-lib/buffer.h>

 #include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffy.h"
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffy.h"

-#include "buffer.h"

 #include "mx.h"
 #include "mh.h"
 #include "sidebar.h"
 #include "mx.h"
 #include "mh.h"
 #include "sidebar.h"

diff --git a/color.c b/color.c
index 82180f7..a160d6a 100644 (file)
--- a/color.c
+++ b/color.c
@@ -15,9 +15,9 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "mutt_curses.h"
 #include "mapping.h"
 
 #include "mutt_curses.h"
 #include "mapping.h"
 

diff --git a/hook.c b/hook.c
index ab9898e..4222f52 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -14,9 +14,9 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "mx.h"
 #include "mutt_crypt.h"
 
 #include "mx.h"
 #include "mutt_crypt.h"
 

diff --git a/imap/imap.c b/imap/imap.c
index 3945456..e7b4adc 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -18,9 +18,9 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "mx.h"
 #include "globals.h"
 #include "sort.h"
 #include "mx.h"
 #include "globals.h"
 #include "sort.h"

diff --git a/imap/message.c b/imap/message.c
index 7bc797f..89cf1a0 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -20,9 +20,9 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "mutt_curses.h"
 #include "imap_private.h"
 #include "message.h"
 #include "mutt_curses.h"
 #include "imap_private.h"
 #include "message.h"

diff --git a/init.c b/init.c
index 1ecdf17..63b3470 100644 (file)
--- a/init.c
+++ b/init.c
@@ -18,9 +18,9 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "mapping.h"
 #include "mutt_curses.h"
 #include "history.h"
 #include "mapping.h"
 #include "mutt_curses.h"
 #include "history.h"

diff --git a/keymap.c b/keymap.c
index abfc8c3..93f8225 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -15,9 +15,9 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"

diff --git a/lib-lib/Makefile.am b/lib-lib/Makefile.am
index 2251d47..2b844c1 100644 (file)
--- a/lib-lib/Makefile.am
+++ b/lib-lib/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LIBRARIES = liblib.a
 
 noinst_LIBRARIES = liblib.a
 

-liblib_a_SOURCES = mem.h str.h ascii.h                                       \
-                         str.c ascii.c
+liblib_a_SOURCES = mem.h str.h ascii.h buffer.h                              \
+                         str.c ascii.c buffer.c

 
 noinst_HEADERS = mem.h str.h ascii.h
 
 
 noinst_HEADERS = mem.h str.h ascii.h
 

diff --git a/buffer.c b/lib-lib/buffer.c
similarity index 99%
rename from buffer.c
rename to lib-lib/buffer.c
index 14ae894..2abfa39 100644 (file)
--- a/buffer.c
+++ b/lib-lib/buffer.c
@@ -25,9 +25,6 @@
  * 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 <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -36,8 +33,8 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>

+#include <lib-lib/buffer.h>

 
 

-#include "buffer.h"

 #include "mutt.h"
 
 #include "lib/debug.h"
 #include "mutt.h"
 
 #include "lib/debug.h"

diff --git a/buffer.h b/lib-lib/buffer.h
similarity index 94%
rename from buffer.h
rename to lib-lib/buffer.h
index bd3499d..da476ac 100644 (file)
--- a/buffer.h
+++ b/lib-lib/buffer.h
@@ -26,8 +26,8 @@
  * please see the file GPL in the top level source directory.
  */
 
  * please see the file GPL in the top level source directory.
  */
 

-#ifndef _MUTT_BUFFER_H
-#define _MUTT_BUFFER_H
+#ifndef MUTT_LIB_LIB_BUFFER_H
+#define MUTT_LIB_LIB_BUFFER_H

 
 #include <lib-lib/str.h>
 
 
 #include <lib-lib/str.h>
 


@@ -53,4 +53,4 @@ static inline void mutt_buffer_addch(BUFFER *b, char c) {
     mutt_buffer_add(b, &c, 1);
 }
 
     mutt_buffer_add(b, &c, 1);
 }
 

-#endif /* !_MUTT_BUFFER_H */
+#endif /* MUTT_LIB_LIB_BUFFER_H */

diff --git a/mutt.h b/mutt.h
index fc4844b..2913432 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -41,7 +41,8 @@
 #include <pwd.h>
 #include <grp.h>
 
 #include <pwd.h>
 #include <grp.h>
 

-#include "buffer.h"
+#include <lib-lib/buffer.h>
+

 #include "rfc822.h"
 #include "list.h"
 #include "hash.h"
 #include "rfc822.h"
 #include "list.h"
 #include "hash.h"

diff --git a/muttlib.c b/muttlib.c
index d57433e..2e15ea0 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -16,9 +16,9 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "enter.h"
 #include "mutt_curses.h"
 #include "mime.h"
 #include "enter.h"
 #include "mutt_curses.h"
 #include "mime.h"

diff --git a/parse.c b/parse.c
index 70379fa..2d1ecd6 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -15,9 +15,9 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "enter.h"
 #include "recvattach.h"
 #include "mx.h"
 #include "enter.h"
 #include "recvattach.h"
 #include "mx.h"

diff --git a/pattern.c b/pattern.c
index 46efa88..500d3b3 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -15,9 +15,9 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "buffer.h"

 #include "handler.h"
 #include "enter.h"
 #include "mx.h"
 #include "handler.h"
 #include "enter.h"
 #include "mx.h"

diff --git a/protos.h b/protos.h
index 46532d0..52f0de8 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -19,7 +19,7 @@
 
 #include "mbyte.h"
 
 
 #include "mbyte.h"
 

-#include "buffer.h"
+#include <lib-lib/buffer.h>

 
 #define MoreArgs(p) (*p->dptr && *p->dptr != ';' && *p->dptr != '#')
 
 
 #define MoreArgs(p) (*p->dptr && *p->dptr != ';' && *p->dptr != '#')
 

diff --git a/score.c b/score.c
index def0501..7d04fb4 100644 (file)
--- a/score.c
+++ b/score.c
@@ -13,10 +13,10 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/macros.h>
 
 #include <lib-lib/mem.h>
 #include <lib-lib/macros.h>

+#include <lib-lib/buffer.h>

 
 #include "mutt.h"
 #include "sort.h"
 
 #include "mutt.h"
 #include "sort.h"

-#include "buffer.h"

 
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>