← Back to branch summary

~registry/lvm2/master

« back to all changes in this revision

Viewing changes to lib/log/log.c

  • Committer: Alasdair Kergon
  • Date: 2004-02-13 22:56:45 UTC
  • Revision ID: git-v1:69792976e44ae1178a99a03a34f75040c95a45d7
Basic internationalisation support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/log/log.c
186
186
        va_list ap;
187
187
        char buf[1024];
188
188
        int bufused, n;
 
189
        char *trformat;         /* Translated format string */
 
190
 
 
191
        trformat = _(format);
189
192
 
190
193
        if (!_log_suppress) {
191
194
                va_start(ap, format);
197
200
                                printf("%s%s", _cmd_name, _msg_prefix);
198
201
                                if (_indent)
199
202
                                        printf("      ");
200
 
                                vprintf(format, ap);
 
203
                                vprintf(trformat, ap);
201
204
                                putchar('\n');
202
205
                        }
203
206
                        break;
207
210
                                printf("%s%s", _cmd_name, _msg_prefix);
208
211
                                if (_indent)
209
212
                                        printf("    ");
210
 
                                vprintf(format, ap);
 
213
                                vprintf(trformat, ap);
211
214
                                putchar('\n');
212
215
                        }
213
216
                        break;
216
219
                                printf("%s%s", _cmd_name, _msg_prefix);
217
220
                                if (_indent)
218
221
                                        printf("  ");
219
 
                                vprintf(format, ap);
 
222
                                vprintf(trformat, ap);
220
223
                                putchar('\n');
221
224
                        }
222
225
                        break;
223
226
                case _LOG_WARN:
224
227
                        printf("%s%s", _cmd_name, _msg_prefix);
225
 
                        vprintf(format, ap);
 
228
                        vprintf(trformat, ap);
226
229
                        putchar('\n');
227
230
                        break;
228
231
                case _LOG_ERR:
229
232
                        fprintf(stderr, "%s%s", _cmd_name, _msg_prefix);
230
 
                        vfprintf(stderr, format, ap);
 
233
                        vfprintf(stderr, trformat, ap);
231
234
                        fputc('\n', stderr);
232
235
                        break;
233
236
                case _LOG_FATAL:
234
237
                default:
235
238
                        fprintf(stderr, "%s%s", _cmd_name, _msg_prefix);
236
 
                        vfprintf(stderr, format, ap);
 
239
                        vfprintf(stderr, trformat, ap);
237
240
                        fputc('\n', stderr);
238
241
                        break;
239
242
                        ;
249
252
                        _msg_prefix);
250
253
 
251
254
                va_start(ap, format);
252
 
                vfprintf(_log_file, format, ap);
 
255
                vfprintf(_log_file, trformat, ap);
253
256
                va_end(ap);
254
257
 
255
258
                fprintf(_log_file, "\n");
258
261
 
259
262
        if (_syslog && (_log_while_suspended || !memlock())) {
260
263
                va_start(ap, format);
261
 
                vsyslog(level, format, ap);
 
264
                vsyslog(level, trformat, ap);
262
265
                va_end(ap);
263
266
        }
264
267
 
276
279
 
277
280
                va_start(ap, format);
278
281
                n = vsnprintf(buf + bufused - 1, sizeof(buf) - bufused - 1,
279
 
                              format, ap);
 
282
                              trformat, ap);
280
283
                va_end(ap);
281
284
                bufused += n;
282
285