Skip to content

Commit e3d473d

Browse files
committed
Resync
1 parent bc44313 commit e3d473d

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

include/file/config_file.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,12 @@ bool config_entry_exists(config_file_t *conf, const char *entry);
116116

117117
struct config_entry_list
118118
{
119-
/* If we got this from an #include,
120-
* do not allow overwrite. */
121-
bool readonly;
122-
123119
char *key;
124120
char *value;
125121
struct config_entry_list *next;
122+
/* If we got this from an #include,
123+
* do not allow overwrite. */
124+
bool readonly;
126125
};
127126

128127

string/stdstring.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ char *string_init(const char *src)
3434
void string_set(char **string, const char *src)
3535
{
3636
free(*string);
37-
*string = src ? strdup(src) : NULL;
37+
*string = string_init(src);
3838
}
3939

4040

0 commit comments

Comments
 (0)