Skip to content

Commit

Permalink
ccan: update so we get exposed path constants.
Browse files Browse the repository at this point in the history
Signed-off-by: Rusty Russell <[email protected]>
  • Loading branch information
rustyrussell authored and cdecker committed Feb 16, 2018
1 parent c8f9ea7 commit ccd0e5d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ccan/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net.

CCAN version: init-2401-ge2d15a2b
CCAN version: init-2402-gec1f7161
3 changes: 0 additions & 3 deletions ccan/ccan/tal/path/path.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
#include <errno.h>
#include <assert.h>

#define PATH_SEP_STR "/"
#define PATH_SEP (PATH_SEP_STR[0])

char *path_cwd(const tal_t *ctx)
{
size_t len = 64;
Expand Down
4 changes: 4 additions & 0 deletions ccan/ccan/tal/path/path.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,8 @@ char **path_split(const tal_t *ctx, const char *path TAKES);
*/
size_t path_ext_off(const char *path);

/* Separator constants */
#define PATH_SEP_STR "/"
#define PATH_SEP (PATH_SEP_STR[0])

#endif /* CCAN_PATH_H */
4 changes: 0 additions & 4 deletions lightningd/lightningd.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ static const char *find_my_path(const tal_t *ctx, const char *argv0)
{
char *me, *tmpctx = tal_tmpctx(ctx);

/* FIXME: Expose in CCAN! */
#define PATH_SEP_STR "/"
#define PATH_SEP (PATH_SEP_STR[0])

if (strchr(argv0, PATH_SEP)) {
const char *path;
/* Absolute paths are easy. */
Expand Down

0 comments on commit ccd0e5d

Please sign in to comment.