libmpm

morphux C package management library
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/libmpm

commit 6df6bc3f7284858c68c35cb7957df896878af814
parent 1cfa62056b27734d77e5486ae8980b999b5ebe80
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Thu, 30 Mar 2017 22:38:45 +0200

Fix(Merge): Conflict in inc/libmpm.h

Diffstat:
M.gitmodules | 3+++
Mdocs/doxyfile | 6+++---
Adocs/doxygen-theme | 1+
Minc/database.h | 1+
Minc/libmpm.h | 1+
Msrc/database.c | 4+---
6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -10,3 +10,6 @@ [submodule "lib/libconfuse"] path = lib/libconfuse url = https://github.com/martinh/libconfuse.git +[submodule "docs/doxygen-theme"] + path = docs/doxygen-theme + url = https://github.com/Ne02ptzero/doxygen-theme diff --git a/docs/doxyfile b/docs/doxyfile @@ -7,7 +7,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Morphux/libmpm PROJECT_NUMBER = PROJECT_BRIEF = -PROJECT_LOGO = +PROJECT_LOGO = /morphux/graphic/logo/single_penguin.png OUTPUT_DIRECTORY = docs CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO @@ -93,7 +93,7 @@ SHOW_USED_FILES = YES SHOW_FILES = YES SHOW_NAMESPACES = YES FILE_VERSION_FILTER = -LAYOUT_FILE = +LAYOUT_FILE = ./docs/doxygen-theme/DoxygenLayout.xml CITE_BIB_FILES = #--------------------------------------------------------------------------- # Configuration options related to warning and progress messages @@ -196,7 +196,7 @@ HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = -HTML_EXTRA_STYLESHEET = +HTML_EXTRA_STYLESHEET = ./docs/doxygen-theme/customdoxygen.css HTML_EXTRA_FILES = HTML_COLORSTYLE_HUE = 220 HTML_COLORSTYLE_SAT = 100 diff --git a/docs/doxygen-theme b/docs/doxygen-theme @@ -0,0 +1 @@ +Subproject commit e55ed43dc48f614179d702adcc13347bb3d47490 diff --git a/inc/database.h b/inc/database.h @@ -20,6 +20,7 @@ # include <morphux.h> # include <files.h> # include <package.h> +# include <category.h> # define DB_FN "test.db" # define SQL_CALLBACK_PTR(name) int (*name)(void *, int, char**, char**) diff --git a/inc/libmpm.h b/inc/libmpm.h @@ -22,5 +22,6 @@ # include <database.h> # include <config.h> # include <packer.h> +# include <package.h> #endif /* LIBMPM_H */ diff --git a/src/database.c b/src/database.c @@ -69,6 +69,7 @@ database_t *mpm_database_open(u8_t *ret, const char *fn) { database_t *ptr; u8_t error = 0; + *ret = 0; ptr = malloc(sizeof(database_t)); assert(ptr != NULL); if (fn != NULL) @@ -299,9 +300,6 @@ u8_t mpm_get_file_by_parent_name(database_t *ptr, const char *name, mlist_t **fi return ret; } - - - file_t *sql_to_file(file_t *ptr, char *name, char *val) { if (ptr == NULL) return ptr;