projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make uci_lookup_ptr() use the extended flag properly again
[project/uci.git]
/
delta.c
diff --git
a/delta.c
b/delta.c
index
e0fa1b1
..
f697141
100644
(file)
--- a/
delta.c
+++ b/
delta.c
@@
-25,6
+25,11
@@
#include <fcntl.h>
#include <stdio.h>
#include <ctype.h>
#include <fcntl.h>
#include <stdio.h>
#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "uci.h"
+#include "uci_internal.h"
/* record a change that was done to a package */
void
/* record a change that was done to a package */
void
@@
-157,7
+162,7
@@
static void uci_parse_delta_line(struct uci_context *ctx, struct uci_package *p,
switch(cmd) {
case UCI_CMD_REORDER:
switch(cmd) {
case UCI_CMD_REORDER:
- expand_ptr(ctx, &ptr, true);
+
uci_
expand_ptr(ctx, &ptr, true);
if (!ptr.s)
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
UCI_INTERNAL(uci_reorder_section, ctx, ptr.s, strtoul(ptr.value, NULL, 10));
if (!ptr.s)
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
UCI_INTERNAL(uci_reorder_section, ctx, ptr.s, strtoul(ptr.value, NULL, 10));
@@
-349,7
+354,7
@@
int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
char *option = NULL;
UCI_HANDLE_ERR(ctx);
char *option = NULL;
UCI_HANDLE_ERR(ctx);
- expand_ptr(ctx, ptr, false);
+
uci_
expand_ptr(ctx, ptr, false);
UCI_ASSERT(ctx, ptr->p->has_delta);
/*
UCI_ASSERT(ctx, ptr->p->has_delta);
/*