git.maemo.org Git - oespirit1/blob - osso-gnome-vfs2/no-g-gnuc-function.patch

   1 diff --git libgnomevfs/gnome-vfs-mime-handlers.c libgnomevfs/gnome-vfs-mime-handlers.c
   2 index 485e0b5..38a6e16 100644
   3 --- libgnomevfs/gnome-vfs-mime-handlers.c
   4 +++ libgnomevfs/gnome-vfs-mime-handlers.c
   5 @@ -40,8 +40,7 @@
   6  #include <gmodule.h>
   7
   8  #define MIXED_API_WARNING "Cannot call %s with a GNOMEVFSMimeApplication structure "\
   9 -                         "constructed by the deprecated application registry", \
  10 -                         G_GNUC_FUNCTION
  11 +                         "constructed by the deprecated application registry"
  12
  13  struct _GnomeVFSMimeApplicationPrivate
  14  {
  15 diff --git modules/sftp-method.c modules/sftp-method.c
  16 index d44e225..b2a9503 100644
  17 --- modules/sftp-method.c
  18 +++ modules/sftp-method.c
  19 @@ -317,7 +317,7 @@ buffer_send (Buffer *buf, int fd)
  20         g_return_val_if_fail (buf->base != NULL, GNOME_VFS_ERROR_INTERNAL);
  21
  22         DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Sending message of length %d from %p to %d",
  23 -                      G_GNUC_FUNCTION, len, buf, fd));
  24 +                      "", len, buf, fd));
  25
  26         buf->read_ptr -= sizeof (guint32);
  27
  28 @@ -338,7 +338,7 @@ buffer_send (Buffer *buf, int fd)
  29         }
  30
  31         DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: %d bytes written",
  32 -                      G_GNUC_FUNCTION, bytes_written));
  33 +                      "", bytes_written));
  34
  35         return res;
  36  }
  37 @@ -352,24 +352,24 @@ buffer_recv (Buffer *buf, int fd)
  38         g_return_val_if_fail (buf->base != NULL, GNOME_VFS_ERROR_INTERNAL);
  39
  40         DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Receiving message from %d to %p",
  41 -                      G_GNUC_FUNCTION, fd, buf));
  42 +                      "", fd, buf));
  43
  44         bytes_read = atomic_io (read, fd, &r_len, sizeof (guint32));
  45
  46         if (bytes_read == -1) {
  47                 DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Could not read length: %s",
  48 -                              G_GNUC_FUNCTION, g_strerror (errno)));
  49 +                              "", g_strerror (errno)));
  50                 return GNOME_VFS_ERROR_IO;
  51         }
  52         else if (bytes_read == 0) {
  53                 DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Connection closed: %d",
  54 -                              G_GNUC_FUNCTION, fd));
  55 +                              "", fd));
  56                 return GNOME_VFS_ERROR_IO;
  57         }
  58
  59         len = GINT32_TO_BE (r_len);
  60
  61 -       DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Message is of length %d", G_GNUC_FUNCTION, len));
  62 +       DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Message is of length %d", "", len));
  63
  64         /* 256K was the max allowed in OpenSSH */
  65         if (len > 256 * 1024) {
  66 @@ -385,7 +385,7 @@ buffer_recv (Buffer *buf, int fd)
  67         }
  68
  69         DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: %d bytes read",
  70 -                      G_GNUC_FUNCTION, bytes_read));
  71 +                      "", bytes_read));
  72
  73         buf->write_ptr += bytes_read;
  74
  75 @@ -513,7 +513,7 @@ buffer_read_file_info (Buffer *buf, GnomeVFSFileInfo *info)
  76                 info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS;
  77                 info->permissions = buffer_read_gint32 (buf);
  78
  79 -               DEBUG4 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Permissions is %x", G_GNUC_FUNCTION,
  80 +               DEBUG4 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Permissions is %x", "",
  81                                info->permissions));
  82
  83                 info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_TYPE;
  84 @@ -752,7 +752,7 @@ iobuf_read_file_info (int fd, GnomeVFSFileInfo *info, guint expected_id)
  85                 status = buffer_read_gint32 (&msg);
  86                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
  87                               "%s: Reading file info failed with SSH2_FXP_STATUS(%u), status %u",
  88 -                             G_GNUC_FUNCTION, type, status));
  89 +                             "", type, status));
  90                 res = sftp_status_to_vfs_result (status);
  91         } else if (type == SSH2_FXP_ATTRS) {
  92                 buffer_read_file_info (&msg, info);
  93 @@ -1168,7 +1168,7 @@ sftp_connect (SftpConnection **connection, const GnomeVFSURI *uri)
  94         args[last_arg++] = NULL;
  95
  96         DEBUG (tmp = g_strjoinv (" ", args));
  97 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Command line is %s", G_GNUC_FUNCTION, tmp));
  98 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Command line is %s", "", tmp));
  99         DEBUG (g_free (tmp));
 100
 101         tty_fd = -1;
 102 @@ -1402,7 +1402,7 @@ sftp_connect (SftpConnection **connection, const GnomeVFSURI *uri)
 103                 /* Response given was not correct. Give up with a protocol error */
 104
 105                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 106 -                             "%s: Protocol error: message type is %d", G_GNUC_FUNCTION, type));
 107 +                             "%s: Protocol error: message type is %d", "", type));
 108                 res = GNOME_VFS_ERROR_PROTOCOL_ERROR;
 109         } else {
 110                 /* Everything's A-OK. Set up the connection and go */
 111 @@ -1493,13 +1493,13 @@ sftp_get_connection (SftpConnection **connection, const GnomeVFSURI *uri)
 112         hash_name = g_strconcat (user_name, "@", host_name, NULL);
 113
 114         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 115 -                     "%s: Getting connection to %s", G_GNUC_FUNCTION, hash_name));
 116 +                     "%s: Getting connection to %s", "", hash_name));
 117
 118         *connection = g_hash_table_lookup (sftp_connection_table, hash_name);
 119
 120         if (*connection == NULL) {
 121                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 122 -                             "%s: Connection not found. Opening new one.", G_GNUC_FUNCTION));
 123 +                             "%s: Connection not found. Opening new one.", ""));
 124
 125                 res = sftp_connect (connection, uri);
 126
 127 @@ -1518,7 +1518,7 @@ sftp_get_connection (SftpConnection **connection, const GnomeVFSURI *uri)
 128  #if 0
 129         else if (!g_mutex_trylock ((*connection)->mutex)) {
 130                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 131 -                             "%s: Connection found but locked. Opening new one.", G_GNUC_FUNCTION));
 132 +                             "%s: Connection found but locked. Opening new one.", ""));
 133
 134                 res = sftp_connect (connection, uri);
 135                 g_mutex_lock ((*connection)->mutex);
 136 @@ -1529,13 +1529,13 @@ sftp_get_connection (SftpConnection **connection, const GnomeVFSURI *uri)
 137  #endif
 138         else {
 139                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Connection found. Locking",
 140 -                             G_GNUC_FUNCTION));
 141 +                             ""));
 142
 143                 g_mutex_lock ((*connection)->mutex);
 144                 sftp_connection_ref ((*connection));
 145
 146                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Lock acquired",
 147 -                             G_GNUC_FUNCTION));
 148 +                             ""));
 149
 150                 g_free (hash_name);
 151                 res = GNOME_VFS_OK;
 152 @@ -1577,25 +1577,25 @@ sftp_connection_process_errors (GIOChannel *channel, GIOCondition cond, GnomeVFS
 153
 154         if (cond != G_IO_IN) return TRUE;
 155
 156 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 157 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 158
 159         io_status = g_io_channel_read_line (channel, &str, NULL, NULL, &error);
 160
 161         switch (io_status) {
 162             case G_IO_STATUS_ERROR:
 163                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 164 -                             "%s: Could not read error message: %s", G_GNUC_FUNCTION, error->message));
 165 +                             "%s: Could not read error message: %s", "", error->message));
 166                 *status = GNOME_VFS_ERROR_IO;
 167                 break;
 168
 169             case G_IO_STATUS_EOF:
 170                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 171 -                             "%s: Subprocess closed the connection", G_GNUC_FUNCTION));
 172 +                             "%s: Subprocess closed the connection", ""));
 173                 *status = GNOME_VFS_ERROR_EOF;
 174                 return FALSE;
 175
 176             case G_IO_STATUS_AGAIN:
 177 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: No error", G_GNUC_FUNCTION));
 178 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: No error", ""));
 179                 *status = GNOME_VFS_OK;
 180                 break;
 181
 182 @@ -1609,7 +1609,7 @@ sftp_connection_process_errors (GIOChannel *channel, GIOCondition cond, GnomeVFS
 183                                 str = str1;
 184
 185                                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 186 -                                             "%s: Error message was %s", G_GNUC_FUNCTION, str));
 187 +                                             "%s: Error message was %s", "", str));
 188                         }
 189                 }
 190
 191 @@ -1640,7 +1640,7 @@ sftp_connection_get_id (SftpConnection *conn)
 192         g_return_val_if_fail (conn != NULL, 0);
 193
 194         id = conn->msg_id++;
 195 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Message id %d", G_GNUC_FUNCTION, id));
 196 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Message id %d", "", id));
 197
 198         return id;
 199  }
 200 @@ -1736,12 +1736,12 @@ get_real_path (SftpConnection *conn, const gchar *path, gchar **realpath)
 201                 buffer_free (&msg);
 202                 *realpath = NULL;
 203                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Bad status (%d).",
 204 -                             G_GNUC_FUNCTION, status));
 205 +                             "", status));
 206                 return sftp_status_to_vfs_result (status);
 207         }
 208         else if (recv_id != id || type != SSH2_FXP_NAME) {
 209                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Bad message id or type (%d, %d).",
 210 -                             G_GNUC_FUNCTION, recv_id, type));
 211 +                             "", recv_id, type));
 212                 buffer_free (&msg);
 213                 return GNOME_VFS_ERROR_PROTOCOL_ERROR;
 214         }
 215 @@ -1750,13 +1750,13 @@ get_real_path (SftpConnection *conn, const gchar *path, gchar **realpath)
 216
 217         if (count == 0) {
 218                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: File not found: %s",
 219 -                             G_GNUC_FUNCTION, path));
 220 +                             "", path));
 221                 buffer_free (&msg);
 222                 return GNOME_VFS_ERROR_NOT_FOUND;
 223         }
 224         else if (count != 1) {
 225                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Bad count (%d).",
 226 -                             G_GNUC_FUNCTION, count));
 227 +                             "", count));
 228                 buffer_free (&msg);
 229                 return GNOME_VFS_ERROR_PROTOCOL_ERROR;
 230         }
 231 @@ -1791,7 +1791,7 @@ do_open (GnomeVFSMethod        *method,
 232         gint sftp_handle_len;
 233         gchar *path;
 234
 235 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 236 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 237
 238         res = sftp_get_connection (&conn, uri);
 239         if (res != GNOME_VFS_OK) return res;
 240 @@ -1832,7 +1832,7 @@ do_open (GnomeVFSMethod        *method,
 241
 242                 sftp_connection_unlock (conn);
 243
 244 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 245 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 246                 return GNOME_VFS_OK;
 247         } else {
 248                 *method_handle = NULL;
 249 @@ -1842,7 +1842,7 @@ do_open (GnomeVFSMethod        *method,
 250                 sftp_connection_unref (conn);
 251                 sftp_connection_unlock (conn);
 252
 253 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 254 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 255                 return res;
 256         }
 257  }
 258 @@ -1869,7 +1869,7 @@ do_create (GnomeVFSMethod        *method,
 259         guint sftp_handle_len;
 260         gchar *path;
 261
 262 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 263 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 264
 265         res = sftp_get_connection (&conn, uri);
 266         if (res != GNOME_VFS_OK) return res;
 267 @@ -1917,7 +1917,7 @@ do_create (GnomeVFSMethod        *method,
 268
 269                 sftp_connection_unlock (conn);
 270
 271 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 272 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 273                 return GNOME_VFS_OK;
 274         } else {
 275                 *method_handle = NULL;
 276 @@ -1927,7 +1927,7 @@ do_create (GnomeVFSMethod        *method,
 277                 sftp_connection_unref (conn);
 278                 sftp_connection_unlock (conn);
 279
 280 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 281 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 282                 return res;
 283         }
 284  }
 285 @@ -1944,7 +1944,7 @@ do_close (GnomeVFSMethod       *method,
 286
 287         guint i;
 288
 289 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 290 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 291
 292         handle = SFTP_OPEN_HANDLE (method_handle);
 293
 294 @@ -1972,7 +1972,7 @@ do_close (GnomeVFSMethod       *method,
 295         g_free (handle->path);
 296         g_free (handle);
 297
 298 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 299 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 300
 301         return status;
 302  }
 303 @@ -2007,7 +2007,7 @@ do_read (GnomeVFSMethod       *method,
 304
 305         struct ReadRequest *read_req;
 306
 307 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 308 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 309
 310         got_eof = FALSE;
 311
 312 @@ -2040,7 +2040,7 @@ do_read (GnomeVFSMethod       *method,
 313
 314                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 315                                       "%s: (%d) Sending read request %d, length %d, pointer %p",
 316 -                                     G_GNUC_FUNCTION, req_ptr, read_req[req_ptr].id,
 317 +                                     "", req_ptr, read_req[req_ptr].id,
 318                                       read_req[req_ptr].req_len, read_req[req_ptr].ptr));
 319
 320                         outstanding++;
 321 @@ -2079,7 +2079,7 @@ do_read (GnomeVFSMethod       *method,
 322
 323                 if (req_svc == req_ptr) { /* Didn't find the id -- unexpected reply */
 324                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Unexpected id %d",
 325 -                                     G_GNUC_FUNCTION, recv_id));
 326 +                                     "", recv_id));
 327                         buffer_free (&msg);
 328                         g_free (read_req);
 329                         sftp_connection_unlock (handle->connection);
 330 @@ -2091,14 +2091,14 @@ do_read (GnomeVFSMethod       *method,
 331                         status = buffer_read_gint32 (&msg);
 332
 333                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Got status message %d",
 334 -                                     G_GNUC_FUNCTION, status));
 335 +                                     "", status));
 336
 337                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: req_svc = %d, req_ptr = %d",
 338 -                                     G_GNUC_FUNCTION, req_svc, req_ptr));
 339 +                                     "", req_svc, req_ptr));
 340
 341                         if (status != SSH2_FX_EOF) {
 342                                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: status return %d",
 343 -                                             G_GNUC_FUNCTION, sftp_status_to_vfs_result (status)));
 344 +                                             "", sftp_status_to_vfs_result (status)));
 345                                 buffer_free (&msg);
 346                                 g_free (read_req);
 347                                 sftp_connection_unlock (handle->connection);
 348 @@ -2158,7 +2158,7 @@ do_read (GnomeVFSMethod       *method,
 349         buffer_free (&msg);
 350         g_free (read_req);
 351
 352 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 353 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 354
 355         sftp_connection_unlock (handle->connection);
 356
 357 @@ -2194,7 +2194,7 @@ do_write (GnomeVFSMethod       *method,
 358
 359         struct WriteRequest *write_req;
 360
 361 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 362 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 363
 364         handle = SFTP_OPEN_HANDLE (method_handle);
 365
 366 @@ -2223,7 +2223,7 @@ do_write (GnomeVFSMethod       *method,
 367
 368                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 369                                       "%s: (%d) Sending write request %d, length %d, offset %d",
 370 -                                     G_GNUC_FUNCTION, req_ptr, write_req[req_ptr].id,
 371 +                                     "", req_ptr, write_req[req_ptr].id,
 372                                       write_req[req_ptr].req_len, write_req[req_ptr].offset));
 373
 374                         buffer_clear (&msg);
 375 @@ -2271,7 +2271,7 @@ do_write (GnomeVFSMethod       *method,
 376
 377                 if (req_svc == req_ptr) { /* Didn't find the id -- unexpected reply */
 378                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Unexpected id %d",
 379 -                                     G_GNUC_FUNCTION, recv_id));
 380 +                                     "", recv_id));
 381                         buffer_free (&msg);
 382                         g_free (write_req);
 383                         sftp_connection_unlock (handle->connection);
 384 @@ -2292,7 +2292,7 @@ do_write (GnomeVFSMethod       *method,
 385         buffer_free (&msg);
 386         g_free (write_req);
 387
 388 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 389 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 390
 391         sftp_connection_unlock (handle->connection);
 392
 393 @@ -2310,7 +2310,7 @@ do_seek (GnomeVFSMethod       *method,
 394         GnomeVFSFileInfo file_info;
 395         GnomeVFSResult res;
 396
 397 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 398 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 399
 400         handle = SFTP_OPEN_HANDLE (method_handle);
 401
 402 @@ -2334,7 +2334,7 @@ do_seek (GnomeVFSMethod       *method,
 403                 break;
 404         }
 405
 406 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 407 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 408
 409         return GNOME_VFS_OK;
 410  }
 411 @@ -2346,12 +2346,12 @@ do_tell (GnomeVFSMethod       *method,
 412  {
 413         SftpOpenHandle *handle;
 414
 415 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 416 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 417
 418         handle = SFTP_OPEN_HANDLE (method_handle);
 419         *offset_return = handle->offset;
 420
 421 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 422 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 423
 424         return GNOME_VFS_OK;
 425  }
 426 @@ -2366,12 +2366,12 @@ sftp_readlink (SftpConnection *connection,
 427         unsigned int id;
 428         char *ret;
 429
 430 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 431 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 432
 433         id = sftp_connection_get_id (connection);
 434
 435         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Requesting symlink target for %s",
 436 -                     G_GNUC_FUNCTION, path));
 437 +                     "", path));
 438
 439         buffer_init (&msg);
 440         buffer_write_gchar (&msg, SSH2_FXP_READLINK);
 441 @@ -2389,7 +2389,7 @@ sftp_readlink (SftpConnection *connection,
 442         ret = NULL;
 443
 444         if (recv_id != id)
 445 -               g_critical ("%s: ID mismatch (%u != %u)", G_GNUC_FUNCTION, recv_id, id);
 446 +               g_critical ("%s: ID mismatch (%u != %u)", "", recv_id, id);
 447         else if (type == SSH2_FXP_NAME) {
 448                 int count;
 449
 450 @@ -2398,20 +2398,20 @@ sftp_readlink (SftpConnection *connection,
 451                         ret = buffer_read_string (&msg, NULL);
 452                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 453                                       "%s: Symlink resolved to %s",
 454 -                                     G_GNUC_FUNCTION, ret));
 455 +                                     "", ret));
 456                 } else {
 457                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 458                                       "%s: Readlink failed, got unexpected filename count (%d, 1 expected)",
 459 -                                     G_GNUC_FUNCTION, count));
 460 +                                     "", count));
 461                 }
 462         } else if (type == SSH2_FXP_STATUS) {
 463                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 464                               "%s: Readlink failed, SSH2_FXP_STATUS response",
 465 -                             G_GNUC_FUNCTION));
 466 +                             ""));
 467         } else {
 468                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 469                               "%s: Readlink failed, bad response (%d)",
 470 -                             G_GNUC_FUNCTION, type));
 471 +                             "", type));
 472         }
 473
 474         buffer_free (&msg);
 475 @@ -2474,11 +2474,11 @@ get_file_info_for_path (SftpConnection          *conn,
 476         GnomeVFSResult res;
 477         unsigned int id;
 478
 479 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 480 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 481
 482         if (conn->version == 0) { /* SSH2_FXP_STAT_VERSION_0 doesn't allow our symlink semantics */
 483                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Server with protocol version 0 detected, LSTAT unsupported.",
 484 -                             G_GNUC_FUNCTION));
 485 +                             ""));
 486                 return GNOME_VFS_ERROR_NOT_SUPPORTED;
 487         }
 488
 489 @@ -2499,7 +2499,7 @@ get_file_info_for_path (SftpConnection          *conn,
 490
 491                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 492                               "%s: Got GNOME_VFS_FILE_INFO_FOLLOW_LINKS, encountered symlink, resolving.",
 493 -                             G_GNUC_FUNCTION));
 494 +                             ""));
 495
 496                 followed_symlinks = 0;
 497
 498 @@ -2517,7 +2517,7 @@ get_file_info_for_path (SftpConnection          *conn,
 499                         if (++followed_symlinks > MAX_SYMLINKS_FOLLOWED) {
 500                                 DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 501                                                "%s: Too many symlinks while resolving %s.",
 502 -                                              G_GNUC_FUNCTION, target_path));
 503 +                                              "", target_path));
 504                                 res = GNOME_VFS_ERROR_TOO_MANY_LINKS;
 505                                 /* we signal failure but still fill the file_info as good as we can.
 506                                  * Is this allowed? */
 507 @@ -2528,12 +2528,12 @@ get_file_info_for_path (SftpConnection          *conn,
 508
 509                         DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 510                                        "%s: Resolved %s to %s",
 511 -                                      G_GNUC_FUNCTION, target_path != NULL ? target_path : path, next_target_reference));
 512 +                                      "", target_path != NULL ? target_path : path, next_target_reference));
 513
 514                         if (next_target_reference == NULL) {
 515                                 DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 516                                                "%s: Resultion of %s to %s failed, target probably nonexistant.",
 517 -                                              G_GNUC_FUNCTION, target_path, next_target_reference));
 518 +                                              "", target_path, next_target_reference));
 519                                 break;
 520                         }
 521
 522 @@ -2551,7 +2551,7 @@ get_file_info_for_path (SftpConnection          *conn,
 523                             (target_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) == 0) {
 524                                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 525                                               "%s: Resultion of %s to %s failed, could not get file info.",
 526 -                                             G_GNUC_FUNCTION, target_path, next_target_reference));
 527 +                                             "", target_path, next_target_reference));
 528                                 res = GNOME_VFS_OK;
 529                                 break;
 530                         }
 531 @@ -2566,7 +2566,7 @@ get_file_info_for_path (SftpConnection          *conn,
 532                         if (target_info->type != GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK) {
 533                                 DEBUG2 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 534                                                "%s: Aborting symlink resolution, %s is no symlink.",
 535 -                                              G_GNUC_FUNCTION, target_path));
 536 +                                              "", target_path));
 537                                 break;
 538                         }
 539
 540 @@ -2576,7 +2576,7 @@ get_file_info_for_path (SftpConnection          *conn,
 541
 542                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 543                               "%s: Resolved %s -> %s",
 544 -                             G_GNUC_FUNCTION, path, target_path));
 545 +                             "", path, target_path));
 546
 547                 if (last_valid_target_info != NULL) {
 548                         gnome_vfs_file_info_clear (file_info);
 549 @@ -2597,7 +2597,7 @@ get_file_info_for_path (SftpConnection          *conn,
 550
 551         update_mime_type_and_name_from_path (file_info, path, options);
 552
 553 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 554 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 555
 556         return res;
 557  }
 558 @@ -2613,7 +2613,7 @@ do_get_file_info (GnomeVFSMethod          *method,
 559         GnomeVFSResult res;
 560         char *path;
 561
 562 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter (no exit notify)", G_GNUC_FUNCTION));
 563 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter (no exit notify)", ""));
 564
 565         res = sftp_get_connection (&conn, uri);
 566         if (res != GNOME_VFS_OK) return res;
 567 @@ -2637,7 +2637,7 @@ do_get_file_info_from_handle (GnomeVFSMethod          *method,
 568  {
 569         SftpOpenHandle *handle;
 570
 571 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter (no exit notify)", G_GNUC_FUNCTION));
 572 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter (no exit notify)", ""));
 573
 574         handle = SFTP_OPEN_HANDLE (method_handle);
 575
 576 @@ -2671,7 +2671,7 @@ do_open_directory (GnomeVFSMethod          *method,
 577         guint id, sftp_handle_len;
 578         gchar *path;
 579
 580 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 581 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 582
 583         res = sftp_get_connection (&conn, uri);
 584         if (res != GNOME_VFS_OK) return res;
 585 @@ -2680,7 +2680,7 @@ do_open_directory (GnomeVFSMethod          *method,
 586
 587         URI_TO_PATH (uri, path);
 588
 589 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Opening %s", G_GNUC_FUNCTION, path));
 590 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Opening %s", "", path));
 591
 592         buffer_init (&msg);
 593         buffer_write_gchar (&msg, SSH2_FXP_OPENDIR);
 594 @@ -2692,7 +2692,7 @@ do_open_directory (GnomeVFSMethod          *method,
 595
 596         res = iobuf_read_handle (conn->in_fd, &sftp_handle, id, &sftp_handle_len);
 597
 598 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Result is %d", G_GNUC_FUNCTION, res));
 599 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Result is %d", "", res));
 600
 601         if (res == GNOME_VFS_OK) {
 602                 handle = g_new0 (SftpOpenHandle, 1);
 603 @@ -2710,8 +2710,8 @@ do_open_directory (GnomeVFSMethod          *method,
 604                 sftp_connection_unlock (conn);
 605
 606                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Opened directory %p",
 607 -                             G_GNUC_FUNCTION, handle));
 608 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 609 +                             "", handle));
 610 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 611                 return GNOME_VFS_OK;
 612         } else {
 613                 /* For some reason, some servers report EOF when the directory doesn't exist. *shrug* */
 614 @@ -2724,7 +2724,7 @@ do_open_directory (GnomeVFSMethod          *method,
 615                 sftp_connection_unlock (conn);
 616
 617                 *method_handle = NULL;
 618 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 619 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 620                 return res;
 621         }
 622  }
 623 @@ -2749,25 +2749,25 @@ do_read_directory (GnomeVFSMethod       *method,
 624         Buffer msg;
 625         gchar type;
 626
 627 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 628 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 629
 630         handle = SFTP_OPEN_HANDLE (method_handle);
 631
 632         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Reading directory %p",
 633 -                     G_GNUC_FUNCTION, handle));
 634 +                     "", handle));
 635
 636         if (handle->info_read_ptr < handle->info_write_ptr) {
 637                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Found directory entry %s in cache",
 638 -                             G_GNUC_FUNCTION, handle->info[handle->info_read_ptr].name));
 639 +                             "", handle->info[handle->info_read_ptr].name));
 640
 641                 gnome_vfs_file_info_copy (file_info, &(handle->info[handle->info_read_ptr++]));
 642 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 643 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 644                 return GNOME_VFS_OK;
 645         }
 646
 647         sftp_connection_lock (handle->connection);
 648
 649 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: No entries in cache", G_GNUC_FUNCTION));
 650 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: No entries in cache", ""));
 651
 652         id = sftp_connection_get_id (handle->connection);
 653
 654 @@ -2797,12 +2797,12 @@ do_read_directory (GnomeVFSMethod       *method,
 655                 if (status == SSH2_FX_EOF || SSH2_FX_OK) {
 656                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 657                                       "%s: End of directory reached (EOF status)",
 658 -                                     G_GNUC_FUNCTION));
 659 +                                     ""));
 660                         sftp_connection_unlock (handle->connection);
 661                         return GNOME_VFS_ERROR_EOF;
 662                 } else {
 663                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Error status %d",
 664 -                                     G_GNUC_FUNCTION, status));
 665 +                                     "", status));
 666                         do_close (method, method_handle, context);
 667                         sftp_connection_unlock (handle->connection);
 668                         return sftp_status_to_vfs_result (status);
 669 @@ -2813,13 +2813,13 @@ do_read_directory (GnomeVFSMethod       *method,
 670                 if (count == 0) {
 671                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
 672                                       "%s: End of directory reached (count 0)",
 673 -                                     G_GNUC_FUNCTION));
 674 +                                     ""));
 675                         buffer_free (&msg);
 676                         sftp_connection_unlock (handle->connection);
 677                         return GNOME_VFS_ERROR_EOF;
 678                 }
 679
 680 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Count is %d", G_GNUC_FUNCTION, count));
 681 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Count is %d", "", count));
 682
 683                 if (handle->info_write_ptr + count > handle->info_alloc) {
 684                         if (handle->info_read_ptr > 0) {
 685 @@ -2853,7 +2853,7 @@ do_read_directory (GnomeVFSMethod       *method,
 686                         buffer_read_file_info (&msg, info);
 687
 688                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: %d, filename is %s",
 689 -                                     G_GNUC_FUNCTION, i, filename));
 690 +                                     "", i, filename));
 691
 692                         if (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE &&
 693                             info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK) {
 694 @@ -2865,7 +2865,7 @@ do_read_directory (GnomeVFSMethod       *method,
 695                                 update_mime_type_and_name_from_path (info, filename, handle->dir_options);
 696
 697                         DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: %d, MIME type is %s",
 698 -                                     G_GNUC_FUNCTION, i, info->mime_type));
 699 +                                     "", i, info->mime_type));
 700
 701                         g_free (filename);
 702                         g_free (longname);
 703 @@ -2874,7 +2874,7 @@ do_read_directory (GnomeVFSMethod       *method,
 704                 }
 705         } else {
 706                 DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Got wrong packet type (%d)",
 707 -                             G_GNUC_FUNCTION, type));
 708 +                             "", type));
 709                 buffer_free (&msg);
 710                 sftp_connection_unlock (handle->connection);
 711                 return GNOME_VFS_ERROR_PROTOCOL_ERROR;
 712 @@ -2889,11 +2889,11 @@ do_read_directory (GnomeVFSMethod       *method,
 713                 g_free (handle->info[handle->info_read_ptr].mime_type);
 714                 handle->info[handle->info_read_ptr].mime_type = NULL;
 715                 handle->info_read_ptr++;
 716 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 717 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 718                 sftp_connection_unlock (handle->connection);
 719                 return GNOME_VFS_OK;
 720         } else {
 721 -               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", G_GNUC_FUNCTION));
 722 +               DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit", ""));
 723                 sftp_connection_unlock (handle->connection);
 724                 return GNOME_VFS_ERROR_EOF;
 725         }
 726 @@ -3152,7 +3152,7 @@ do_set_file_info (GnomeVFSMethod          *method,
 727         guint id;
 728         gchar *path;
 729
 730 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_GNUC_FUNCTION));
 731 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", ""));
 732
 733         if ((mask & ~(GNOME_VFS_SET_FILE_INFO_NAME |
 734                       GNOME_VFS_SET_FILE_INFO_PERMISSIONS |
 735 @@ -3184,7 +3184,7 @@ do_set_file_info (GnomeVFSMethod          *method,
 736         if (res == GNOME_VFS_OK && (mask & GNOME_VFS_SET_FILE_INFO_NAME))
 737                 res = do_rename (method, uri, info->name, context);
 738
 739 -       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit: %d", G_GNUC_FUNCTION, res));
 740 +       DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Exit: %d", "", res));
 741
 742         return res;
 743  }