mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-19 09:13:04 +00:00
style: formatting changes
* src/files.c, src/files.h: Save horizontal space. Prefer `res` for returned values. Put the doc into the header.
This commit is contained in:
19
src/files.c
19
src/files.c
@@ -201,12 +201,12 @@ map_file_name (char const *filename)
|
|||||||
|
|
||||||
size_t oldprefix_len = strlen (p->oldprefix);
|
size_t oldprefix_len = strlen (p->oldprefix);
|
||||||
size_t newprefix_len = strlen (p->newprefix);
|
size_t newprefix_len = strlen (p->newprefix);
|
||||||
char *s = xmalloc (newprefix_len + strlen (filename) - oldprefix_len + 1);
|
char *res = xmalloc (newprefix_len + strlen (filename) - oldprefix_len + 1);
|
||||||
|
|
||||||
char *end = stpcpy (s, p->newprefix);
|
char *end = stpcpy (res, p->newprefix);
|
||||||
stpcpy (end, filename + oldprefix_len);
|
stpcpy (end, filename + oldprefix_len);
|
||||||
|
|
||||||
return s;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -217,17 +217,16 @@ prefix_map_free (struct prefix_map *p)
|
|||||||
free (p);
|
free (p);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Adds a new file prefix mapping. If a file path starts with oldprefix, it
|
|
||||||
will be replaced with newprefix */
|
|
||||||
void
|
void
|
||||||
add_prefix_map (char const *oldprefix, char const *newprefix)
|
add_prefix_map (char const *oldprefix, char const *newprefix)
|
||||||
{
|
{
|
||||||
if (!prefix_maps)
|
if (!prefix_maps)
|
||||||
prefix_maps = gl_list_create_empty (GL_ARRAY_LIST,
|
prefix_maps
|
||||||
/* equals */ NULL,
|
= gl_list_create_empty (GL_ARRAY_LIST,
|
||||||
/* hashcode */ NULL,
|
/* equals */ NULL,
|
||||||
(gl_listelement_dispose_fn) prefix_map_free,
|
/* hashcode */ NULL,
|
||||||
true);
|
(gl_listelement_dispose_fn) prefix_map_free,
|
||||||
|
true);
|
||||||
|
|
||||||
struct prefix_map *p = xmalloc (sizeof (*p));
|
struct prefix_map *p = xmalloc (sizeof (*p));
|
||||||
p->oldprefix = xstrdup (oldprefix);
|
p->oldprefix = xstrdup (oldprefix);
|
||||||
|
|||||||
@@ -95,6 +95,9 @@ void xfclose (FILE *ptr);
|
|||||||
FILE *xfdopen (int fd, char const *mode);
|
FILE *xfdopen (int fd, char const *mode);
|
||||||
|
|
||||||
char *map_file_name (char const *filename);
|
char *map_file_name (char const *filename);
|
||||||
|
|
||||||
|
/* Add a new file prefix mapping. If a file path starts with
|
||||||
|
oldprefix, it will be replaced with newprefix. */
|
||||||
void add_prefix_map (char const *oldprefix, char const *newprefix);
|
void add_prefix_map (char const *oldprefix, char const *newprefix);
|
||||||
|
|
||||||
#endif /* !FILES_H_ */
|
#endif /* !FILES_H_ */
|
||||||
|
|||||||
Reference in New Issue
Block a user