diff options
author | Siim Meerits <sh0@yutani.ee> | 2020-07-27 17:37:00 +0300 |
---|---|---|
committer | Siim Meerits <sh0@yutani.ee> | 2020-07-27 17:37:00 +0300 |
commit | 456a1d598bccc260b233d2e91c469be452e0fbef (patch) | |
tree | c1288655494c94292f6e2eb26d722958899c7107 /tests | |
parent | af2c0e0558e78cae06371abef36f43ca74a9c5c0 (diff) | |
download | libgphoto2-456a1d598bccc260b233d2e91c469be452e0fbef.tar.gz |
Remove trailing whitespace from all *.h and *.c files.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ddb/ddb-common.c | 6 | ||||
-rw-r--r-- | tests/ddb/ddb-common.h | 8 | ||||
-rw-r--r-- | tests/ddb/test-ddb.c | 10 | ||||
-rw-r--r-- | tests/test-camera-list.c | 24 | ||||
-rw-r--r-- | tests/test-endian.c | 6 | ||||
-rw-r--r-- | tests/test-filesys.c | 20 | ||||
-rw-r--r-- | tests/test-gphoto2.c | 6 |
7 files changed, 40 insertions, 40 deletions
diff --git a/tests/ddb/ddb-common.c b/tests/ddb/ddb-common.c index 955a0bda0..155da6958 100644 --- a/tests/ddb/ddb-common.c +++ b/tests/ddb/ddb-common.c @@ -8,10 +8,10 @@ * version 2 of the License, or (at your option) any later version. * * \note - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * \note * You should have received a copy of the GNU Lesser General Public diff --git a/tests/ddb/ddb-common.h b/tests/ddb/ddb-common.h index 075757a5e..dbb779271 100644 --- a/tests/ddb/ddb-common.h +++ b/tests/ddb/ddb-common.h @@ -8,10 +8,10 @@ * version 2 of the License, or (at your option) any later version. * * \note - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * \note * You should have received a copy of the GNU Lesser General Public @@ -36,7 +36,7 @@ typedef union { extern int yylineno; void -yyerror (const char *filename, CameraAbilitiesList *al, +yyerror (const char *filename, CameraAbilitiesList *al, const char *str); int diff --git a/tests/ddb/test-ddb.c b/tests/ddb/test-ddb.c index b07caa629..72ba73c60 100644 --- a/tests/ddb/test-ddb.c +++ b/tests/ddb/test-ddb.c @@ -8,10 +8,10 @@ * version 2 of the License, or (at your option) any later version. * * \note - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * \note * You should have received a copy of the GNU Lesser General Public @@ -30,7 +30,7 @@ #include "ddb-txt.tab.h" static int -compare_camera_abilities(const CameraAbilities *a, +compare_camera_abilities(const CameraAbilities *a, const CameraAbilities *b); CameraAbilitiesList * @@ -182,7 +182,7 @@ strcmp_colon(const char *a, const char *b) static int -compare_camera_abilities(const CameraAbilities *a, +compare_camera_abilities(const CameraAbilities *a, const CameraAbilities *b) { unsigned int errors = 0; diff --git a/tests/test-camera-list.c b/tests/test-camera-list.c index 6a21e86f9..fd0da7fc3 100644 --- a/tests/test-camera-list.c +++ b/tests/test-camera-list.c @@ -8,10 +8,10 @@ * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the @@ -97,7 +97,7 @@ path_basename (const char *pathname) char *result, *tmp; /* remove path part from camlib name */ for (result=tmp=(char *)pathname; (*tmp!='\0'); tmp++) { - if ((*tmp == gp_system_dir_delim) + if ((*tmp == gp_system_dir_delim) && (*(tmp+1) != '\0')) { result = tmp+1; } @@ -115,7 +115,7 @@ typedef enum { /* Text table without headers. */ FMT_FLAT_TEXT, /* Text table just of camlibs without headers, - * which will contain duplicate lines! + * which will contain duplicate lines! * Treat the output with | sort | uniq to get meaningful results. */ FMT_FLAT_CAMLIBS, @@ -173,7 +173,7 @@ parse_command_line (const int argc, char *argv[]) } -/** +/** * Get list of supported cameras, walk through it and create some output. */ int @@ -215,7 +215,7 @@ main (int argc, char *argv[]) } - /* Set output format for file body, + /* Set output format for file body, * and print opening part of output file. */ switch (format) { case FMT_CSV: @@ -233,7 +233,7 @@ main (int argc, char *argv[]) " <driver-name value=\"%3$s\"/>\n" " </camera>\n"; printf("<?xml version=\"%s\" encoding=\"%s\"?>\n" - "<camera-list camera-count=\"%d\">\n", + "<camera-list camera-count=\"%d\">\n", "1.0", "us-ascii", count); break; case FMT_FLAT_CAMLIBS: @@ -246,7 +246,7 @@ main (int argc, char *argv[]) } strcpy(lastmodel,"xxx"); - /* For each camera in the list, add a text snippet to the + /* For each camera in the list, add a text snippet to the * output file. */ for (i = 0; i < count; i++) { CameraAbilities abilities; @@ -262,7 +262,7 @@ main (int argc, char *argv[]) switch (format) { case FMT_HEADED_TEXT: - if ( ((i%25)== 0) && + if ( ((i%25)== 0) && ( (i==0) || ((count-i) > 5) ) ) { print_hline(); print_headline(); @@ -282,7 +282,7 @@ main (int argc, char *argv[]) } printf(fmt_str, - i+1, + i+1, camlib_basename, abilities.id, abilities.model); @@ -307,7 +307,7 @@ main (int argc, char *argv[]) case FMT_COUNT: break; } - + CHECK (gp_abilities_list_free (al)); gp_log_remove_func (logid); return (0); diff --git a/tests/test-endian.c b/tests/test-endian.c index f186a6762..53c06d2b7 100644 --- a/tests/test-endian.c +++ b/tests/test-endian.c @@ -8,10 +8,10 @@ * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the diff --git a/tests/test-filesys.c b/tests/test-filesys.c index a420c0c23..aef4fc0b3 100644 --- a/tests/test-filesys.c +++ b/tests/test-filesys.c @@ -7,10 +7,10 @@ * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the @@ -55,9 +55,9 @@ error_func (GPContext __unused__ *context, const char *str, void __unused__ *dat } static int -set_info_func (CameraFilesystem __unused__ *fs, const char __unused__ *folder, +set_info_func (CameraFilesystem __unused__ *fs, const char __unused__ *folder, const char __unused__ *file, - CameraFileInfo __unused__ info, void __unused__ *data, + CameraFileInfo __unused__ info, void __unused__ *data, GPContext __unused__ *context) { printf (" -> The camera will set the file info here.\n"); @@ -66,7 +66,7 @@ set_info_func (CameraFilesystem __unused__ *fs, const char __unused__ *folder, } static int -get_info_func (CameraFilesystem __unused__ *fs, const char __unused__ *folder, +get_info_func (CameraFilesystem __unused__ *fs, const char __unused__ *folder, const char *file, CameraFileInfo *info, void __unused__ *data, GPContext __unused__ *context) { @@ -78,7 +78,7 @@ get_info_func (CameraFilesystem __unused__ *fs, const char __unused__ *folder, } static int -file_list_func (CameraFilesystem __unused__ *fs, const char *folder, +file_list_func (CameraFilesystem __unused__ *fs, const char *folder, CameraList *list, void __unused__ *data, GPContext __unused__ *context) { @@ -97,11 +97,11 @@ file_list_func (CameraFilesystem __unused__ *fs, const char *folder, } static int -folder_list_func (CameraFilesystem __unused__ *fs, const char *folder, +folder_list_func (CameraFilesystem __unused__ *fs, const char *folder, CameraList *list, void __unused__ *data, GPContext __unused__ *context) { - printf ("### -> The camera will list the folders in '%s' here.\n", + printf ("### -> The camera will list the folders in '%s' here.\n", folder); if (!strcmp (folder, "/")) { @@ -122,7 +122,7 @@ folder_list_func (CameraFilesystem __unused__ *fs, const char *folder, } static int -delete_file_func (CameraFilesystem __unused__ *fs, const char *folder, +delete_file_func (CameraFilesystem __unused__ *fs, const char *folder, const char *file, void __unused__ *data, GPContext __unused__ *context) { diff --git a/tests/test-gphoto2.c b/tests/test-gphoto2.c index 797cdc193..1706f7878 100644 --- a/tests/test-gphoto2.c +++ b/tests/test-gphoto2.c @@ -7,10 +7,10 @@ * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the |