* Added missing header include guards in md5.h and sha1.h.

* Some header cleanup on the pacman side of things - we had alpm.h instead
  alpm_list.h in a few headers.
* removed an extra slash in path-building snprintf in server.c.

8 files changed, 19 insertions, 12 deletions

diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index d4833199..43f06aeb 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -634,7 +634,7 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, alpm_list_t* needles)
  * @param progress progress callback function pointer
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
-int SYMEXPORT alpm_trans_init(pmtranstype_t type, unsigned int flags,
+int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags,
                     alpm_trans_cb_event event, alpm_trans_cb_conv conv,
                     alpm_trans_cb_progress progress)
 {
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 9308efd8..40097162 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -349,7 +349,7 @@ pmtranstype_t alpm_trans_get_type();
 unsigned int alpm_trans_get_flags();
 alpm_list_t * alpm_trans_get_targets();
 alpm_list_t * alpm_trans_get_pkgs();
-int alpm_trans_init(pmtranstype_t type, unsigned int flags,
+int alpm_trans_init(pmtranstype_t type, pmtransflag_t flags,
                     alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv,
                     alpm_trans_cb_progress cb_progress);
 int alpm_trans_sysupgrade(void);
diff --git a/lib/libalpm/md5.h b/lib/libalpm/md5.h
index dbd0ab92..8ae324e3 100644
--- a/lib/libalpm/md5.h
+++ b/lib/libalpm/md5.h
@@ -20,8 +20,9 @@ software for any particular purpose. It is provided "as is"
 without express or implied warranty of any kind.
 
 These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
+documentation and/or software. */
+#ifndef _ALPM_MD5_H
+#define _ALPM_MD5_H
 
 /* POINTER defines a generic pointer type */
 typedef unsigned char *POINTER;
@@ -47,4 +48,6 @@ void _alpm_MD5Final(unsigned char [16], MD5_CTX *);
 char* _alpm_MDFile(char *);
 void  _alpm_MDPrint(unsigned char [16]);
 
+#endif /* _ALPM_MD5_H */
+
 /* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c
index fb3c4147..f9ff6e5d 100644
--- a/lib/libalpm/server.c
+++ b/lib/libalpm/server.c
@@ -203,8 +203,8 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
 			}
 			_alpm_log(PM_LOG_DEBUG, _("using '%s' for download progress"), pkgname);
 
-			snprintf(realfile, PATH_MAX, "%s/%s", localpath, fn);
-			snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn);
+			snprintf(realfile, PATH_MAX, "%s%s", localpath, fn);
+			snprintf(output, PATH_MAX, "%s%s.part", localpath, fn);
 
 			if(alpm_list_find_str(complete, fn)) {
 				continue;
diff --git a/lib/libalpm/sha1.h b/lib/libalpm/sha1.h
index db16d536..fc0aa230 100644
--- a/lib/libalpm/sha1.h
+++ b/lib/libalpm/sha1.h
@@ -15,6 +15,8 @@
    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-1307, USA.  */
+#ifndef _ALPM_SHA1_H
+#define _ALPM_SHA1_H
 
 #include <stdio.h>
 #include <limits.h>
@@ -65,4 +67,6 @@ struct sha_ctx
 /* Needed for pacman */
 char *_alpm_SHAFile (char *);
 
+#endif /* _ALPM_SHA1_H */
+
 /* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index f22697dd..8097e9f8 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -97,7 +97,7 @@ void _alpm_trans_free(void *data)
 	FREE(trans);
 }
 
-int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, unsigned int flags,
+int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags,
                      alpm_trans_cb_event event, alpm_trans_cb_conv conv,
                      alpm_trans_cb_progress progress)
 {
diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h
index 83b99abb..34a060ad 100644
--- a/lib/libalpm/trans.h
+++ b/lib/libalpm/trans.h
@@ -39,7 +39,7 @@ typedef enum _pmtransstate_t {
 /* Transaction */
 struct __pmtrans_t {
 	pmtranstype_t type;
-	unsigned int flags;
+	pmtransflag_t flags;
 	pmtransstate_t state;
 	alpm_list_t *targets;       /* list of (char *) */
 	alpm_list_t *packages;      /* list of (pmpkg_t *) or (pmsyncpkg_t *) */
@@ -78,7 +78,7 @@ do { \
 
 pmtrans_t *_alpm_trans_new(void);
 void _alpm_trans_free(void *data);
-int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, unsigned int flags,
+int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags,
                      alpm_trans_cb_event event, alpm_trans_cb_conv conv,
                      alpm_trans_cb_progress progress);
 int _alpm_trans_sysupgrade(pmtrans_t *trans);
diff --git a/lib/libalpm/versioncmp.h b/lib/libalpm/versioncmp.h
index 5614ada3..60ae7a2c 100644
--- a/lib/libalpm/versioncmp.h
+++ b/lib/libalpm/versioncmp.h
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
  *  USA.
  */
-#ifndef _PM_RPMVERCMP_H
-#define _PM_RPMVERCMP_H
+#ifndef _ALPM_VERSIONCMP_H
+#define _ALPM_VERSIONCMP_H
 
 #include "deps.h"
 #include "package.h"
@@ -30,6 +30,6 @@ int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep);
 int _alpm_versioncmp(const char *a, const char *b);
 
 
-#endif
+#endif /* _ALPM_VERSIONCMP_H */
 
 /* vim: set ts=2 sw=2 noet: */