Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflict fix

This commit is contained in:
Enno Rehling 2017-10-13 19:35:12 +02:00
parent 78360b1466
commit 5a40ff9e62
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kernel/order.c
View File

@ -207,8 +207,8 @@ static int create_data(keyword_t kwd, const char *s,
/* TODO: between mkdata and odata_release, this object is very /* TODO: between mkdata and odata_release, this object is very
* short-lived. */ * short-lived. */
mkdata(&data, strlen(s), s); mkdata(&data, strlen(s), s);
id = odata_save(kwd, data); id = odata_save(data);
release_data(data); odata_release(data);
return id; return id;
} }