← Back to branch summary

~ubuntu-branches/ubuntu/saucy/libgphoto2/saucy-proposed

« back to all changes in this revision

Viewing changes to packaging/generic/print-camera-list.c

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-07-31 07:00:09 UTC
  • mfrom: (1.4.4)
  • Revision ID: package-import@ubuntu.com-20130731070009-enrbvg3hry64cxl1
Tags: 2.5.2-0ubuntu1
* New upstream release.
* Drop 01-increase_max_entries.patch, 02-libusbx_no_debug.patch,
  03-libusbx-fixes.patch: fixed upstream.
* Add libxml2-dev build dependency for new optional features.
* ABI changes: libgphoto2-2 → libgphoto2-6,
  libgphoto2-port0 → libgphoto2-port10
* debian/libgphoto2-dev-doc.install: Adjust to changed HTML API doc folder
  name.
* debian/libgphoto2-port10.install: Adjust for changed libgphoto-port ABI.

Show diffs side-by-side

added added

removed removed

Lines of Context:
packaging/generic/print-camera-list.c
1148
1148
struct timeval glob_tv_zero = { 0, 0 };
1149
1149
 
1150
1150
static void
1151
 
debug_func (GPLogLevel level, const char *domain, const char *format,
1152
 
            va_list args, void *data)
 
1151
debug_func (GPLogLevel level, const char *domain, const char *str,
 
1152
            void *data)
1153
1153
{
1154
1154
        struct timeval tv;
1155
1155
        gettimeofday (&tv,NULL);
1156
 
        fprintf (stderr, "%li.%06li %s(%i): ", 
1157
 
                 tv.tv_sec - glob_tv_zero.tv_sec, 
1158
 
                 (1000000 + tv.tv_usec - glob_tv_zero.tv_usec) % 1000000,
1159
 
                 domain, level);
1160
 
        vfprintf (stderr, format, args);
1161
 
        fprintf (stderr, "\n");
 
1156
        fprintf (stderr, "%li.%06li %s(%i): %s\n", 
 
1157
                 (long) (tv.tv_sec - glob_tv_zero.tv_sec), 
 
1158
                 (1000000L + tv.tv_usec - glob_tv_zero.tv_usec) % 1000000L,
 
1159
                 domain, level, str);
1162
1160
}
1163
1161
 
1164
1162