Kaydet (Commit) dcc06dee authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:flatten in soltools

Change-Id: I3df754c58c90978ef5fccc90518ad1af92516a9e
Reviewed-on: https://gerrit.libreoffice.org/67404
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 6770cddd
......@@ -227,24 +227,24 @@ void
static Tokenrow tr = {&ta, &ta, &ta + 1, 1};
uchar *p;
if (Cplusplus)
{
ta.t = p = (uchar *) outptr;
if (!Cplusplus)
return;
if (! end)
strcpy((char *) p, "extern \"C\" {");
else
strcpy((char *) p, "}");
ta.t = p = (uchar *) outptr;
p += strlen((char *) p);
if (! end)
strcpy((char *) p, "extern \"C\" {");
else
strcpy((char *) p, "}");
*p++ = '\n';
p += strlen((char *) p);
ta.len = (char *) p - outptr;
outptr = (char *) p;
tr.tp = tr.bp;
puttokens(&tr);
}
*p++ = '\n';
ta.len = (char *) p - outptr;
outptr = (char *) p;
tr.tp = tr.bp;
puttokens(&tr);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -56,19 +56,19 @@ void add_include(struct filepointer *filep, struct inclist *file, struct inclist
show_where_not = FALSE;
}
if (newfile) {
/* Only add new dependency files if they don't have "/usr/include" in them. */
if (!(newfile->i_file && strstr(newfile->i_file, "/usr/"))) {
included_by(file, newfile);
}
if (!newfile->i_searched) {
newfile->i_searched = TRUE;
content = getfile(newfile->i_file);
find_includes(content, newfile, file_red, 0, failOK, incCollection, symbols);
freefile(content);
}
if (!newfile)
return;
/* Only add new dependency files if they don't have "/usr/include" in them. */
if (!(newfile->i_file && strstr(newfile->i_file, "/usr/"))) {
included_by(file, newfile);
}
if (!newfile->i_searched) {
newfile->i_searched = TRUE;
content = getfile(newfile->i_file);
find_includes(content, newfile, file_red, 0, failOK, incCollection, symbols);
freefile(content);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment