RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: change versionlink delimiter to ':'

This commit is contained in:
Thomas Schoebel-Theuer 2013-01-20 15:40:47 +01:00
parent cba5c8feee
commit a7e309cf4b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sy_old/mars_light.c
View File

@ -457,8 +457,8 @@ done:
return res; return res;
} }
#define skip_part(s) _skip_part(s, ',', ';') #define skip_part(s) _skip_part(s, ',', ':')
#define skip_sect(s) _skip_part(s, ';', 0) #define skip_sect(s) _skip_part(s, ':', 0)
static inline static inline
int _skip_part(const char *str, const char del1, const char del2) int _skip_part(const char *str, const char del1, const char del2)
{ {
@ -680,7 +680,7 @@ int _update_version_link(struct mars_rotate *rot, struct trans_logger_info *inf)
rot->inf_prev_sequence = inf->inf_sequence; rot->inf_prev_sequence = inf->inf_sequence;
} }
len = sprintf(data, "%d,%s,%lld;%s", inf->inf_sequence, inf->inf_host, inf->inf_log_pos, prev_link ? prev_link : ""); len = sprintf(data, "%d,%s,%lld:%s", inf->inf_sequence, inf->inf_host, inf->inf_log_pos, prev_link ? prev_link : "");
MARS_DBG("data = '%s' len = %d\n", data, len); MARS_DBG("data = '%s' len = %d\n", data, len);
@ -698,14 +698,14 @@ int _update_version_link(struct mars_rotate *rot, struct trans_logger_info *inf)
MARS_ERR("no MEM\n"); MARS_ERR("no MEM\n");
goto out; goto out;
} }
// take the part before ';' // take the part before ':'
for (tmp = prev_digest; *tmp; tmp++) for (tmp = prev_digest; *tmp; tmp++)
if (*tmp == ';') if (*tmp == ':')
break; break;
*tmp = '\0'; *tmp = '\0';
} }
len += sprintf(old + len, ",log-%09d-%s,%lld;%s", inf->inf_sequence, inf->inf_host, inf->inf_log_pos, prev_digest ? prev_digest : ""); len += sprintf(old + len, ",log-%09d-%s,%lld:%s", inf->inf_sequence, inf->inf_host, inf->inf_log_pos, prev_digest ? prev_digest : "");
new = path_make("%s/version-%09d-%s", rot->parent_path, inf->inf_sequence, my_id()); new = path_make("%s/version-%09d-%s", rot->parent_path, inf->inf_sequence, my_id());
if (!new) { if (!new) {