diff options
| author | Manolo Gouy <Manolo> | 2016-10-19 17:25:53 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-10-19 17:25:53 +0000 |
| commit | 8970b21aa2c49cfc3b9ebaee232b1bfa90aba65a (patch) | |
| tree | b840275f37f86ed92242611ffc53e52d9f368417 /src | |
| parent | da276e6efa91900dac5c800f2a71d6db9a7563d8 (diff) | |
Remove erroneous uses of sizeof(filename) where filename is a char* and not a char array
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12051 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/X11/Fl_X11_System_Driver.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/X11/Fl_X11_System_Driver.cxx b/src/drivers/X11/Fl_X11_System_Driver.cxx index 04292c398..9103dbe02 100644 --- a/src/drivers/X11/Fl_X11_System_Driver.cxx +++ b/src/drivers/X11/Fl_X11_System_Driver.cxx @@ -249,10 +249,10 @@ int Fl_X11_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser, } else { for (int i = 0, vp = (struct vmount *) list; i < res; ++i) { name = (char *) vp + vp->vmt_data[VMT_STUB].vmt_off; - strlcpy(filename, name, sizeof(filename)); + strlcpy(filename, name, lname); // Skip the already added root filesystem if (strcmp("/", filename) != 0) { - strlcat(filename, "/", sizeof(filename)); + strlcat(filename, "/", lname); browser->add(filename, icon); } vp = (struct vmount *) ((char *) vp + vp->vmt_length); @@ -280,10 +280,10 @@ int Fl_X11_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser, res = getmntinfo(&list, ST_WAIT); if (0 < res) { for (int i = 0; i < res; ++i) { - strlcpy(filename, list[i].f_mntonname, sizeof(filename)); + strlcpy(filename, list[i].f_mntonname, lname); // Skip the already added root filesystem if (strcmp("/", filename) != 0) { - strlcat(filename, "/", sizeof(filename)); + strlcat(filename, "/", lname); browser->add(filename, icon); } } @@ -333,7 +333,7 @@ int Fl_X11_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser, continue; // "/" was added before // Add a trailing slash (except for the root filesystem) - strlcat(filename, "/", sizeof(filename)); + strlcat(filename, "/", lname); // printf("Fl_File_Browser::load() - adding \"%s\" to list...\n", filename); browser->add(filename, icon); |