← Back to branch summary

~canonical-scott/libnih/trunk

« back to all changes in this revision

Viewing changes to nih-dbus-tool/main.c

  • Committer: Scott James Remnant
  • Date: 2009-11-28 20:25:03 UTC
  • Revision ID: scott@netsplit.com-20091128202503-z713wgvkats6c5m2
* nih-dbus-tool/main.c (source_file_path, header_file_path): Use a
not reached assertion rather than an initial one, to avoid gcc
warnings.
* nih/tests/test_string.c (test_array_addp),
* nih/tests/test_logging.c (test_log_message): Add a couple more
initialisations for gcc, found with -O2

Show diffs side-by-side

added added

removed removed

Lines of Context:
nih-dbus-tool/main.c
119
119
{
120
120
        char *path;
121
121
 
122
 
        nih_assert ((output_path != NULL) || (filename != NULL));
123
 
 
124
122
        if (output_path) {
125
123
                char *ptr;
126
124
 
170
168
                        nih_free (path);
171
169
                        return NULL;
172
170
                }
 
171
        } else {
 
172
                nih_assert_not_reached ();
173
173
        }
174
174
 
175
175
        return path;
199
199
{
200
200
        char *path;
201
201
 
202
 
        nih_assert ((output_path != NULL) || (filename != NULL));
203
 
 
204
202
        if (output_path) {
205
203
                char *ptr;
206
204
 
260
258
                        nih_free (path);
261
259
                        return NULL;
262
260
                }
 
261
        } else {
 
262
                nih_assert_not_reached ();
263
263
        }
264
264
 
265
265
        return path;