From 294b9f3bdcfd63a4bf571f4efd035a0c7551de4a Mon Sep 17 00:00:00 2001 From: Alan Fitton Date: Thu, 26 Jan 2012 10:21:55 +0000 Subject: fix some c99 long long warnings by using GMAXINT_64 instead of INT64_MAX --- src/trg-cell-renderer-epoch.c | 4 ++-- src/trg-cell-renderer-eta.c | 4 ++-- src/trg-cell-renderer-file-icon.c | 2 +- src/trg-cell-renderer-numgteqthan.c | 8 +++---- src/trg-cell-renderer-size.c | 2 +- src/trg-cell-renderer-speed.c | 2 +- src/win32-mailslot.c | 44 ++++++++++++++++++------------------- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/trg-cell-renderer-epoch.c b/src/trg-cell-renderer-epoch.c index ee2f6fc..5ed62c2 100644 --- a/src/trg-cell-renderer-epoch.c +++ b/src/trg-cell-renderer-epoch.c @@ -104,8 +104,8 @@ trg_cell_renderer_epoch_class_init(TrgCellRendererEpochClass * klass) g_param_spec_int64("epoch-value", "Epoch Value", "Epoch Value", - INT64_MIN, - INT64_MAX, + G_MININT64, + G_MAXINT64, 0, G_PARAM_READWRITE | diff --git a/src/trg-cell-renderer-eta.c b/src/trg-cell-renderer-eta.c index 60caee5..cdae864 100644 --- a/src/trg-cell-renderer-eta.c +++ b/src/trg-cell-renderer-eta.c @@ -93,8 +93,8 @@ trg_cell_renderer_eta_class_init(TrgCellRendererEtaClass * klass) g_param_spec_int64("eta-value", "Eta Value", "Eta Value", - INT64_MIN, - INT64_MAX, + G_MININT64, + G_MAXINT64, 0, G_PARAM_READWRITE | diff --git a/src/trg-cell-renderer-file-icon.c b/src/trg-cell-renderer-file-icon.c index 55be2dd..ec17673 100644 --- a/src/trg-cell-renderer-file-icon.c +++ b/src/trg-cell-renderer-file-icon.c @@ -146,7 +146,7 @@ trg_cell_renderer_file_icon_class_init(TrgCellRendererFileIconClass * "File ID", "File ID", -2, - INT64_MAX, + G_MAXINT64, -2, G_PARAM_READWRITE | diff --git a/src/trg-cell-renderer-numgteqthan.c b/src/trg-cell-renderer-numgteqthan.c index d92c81f..0351b71 100644 --- a/src/trg-cell-renderer-numgteqthan.c +++ b/src/trg-cell-renderer-numgteqthan.c @@ -100,8 +100,8 @@ trg_cell_renderer_numgteqthan_class_init(TrgCellRendererNumGtEqThanClass * g_param_spec_int64("value", "Value", "Value", - INT64_MIN, - INT64_MAX, + G_MININT64, + G_MAXINT64, 0, G_PARAM_READWRITE | @@ -116,8 +116,8 @@ trg_cell_renderer_numgteqthan_class_init(TrgCellRendererNumGtEqThanClass * g_param_spec_int64("minvalue", "Min Value", "Min Value", - INT64_MIN, - INT64_MAX, + G_MININT64, + G_MAXINT64, 1, G_PARAM_READWRITE | diff --git a/src/trg-cell-renderer-size.c b/src/trg-cell-renderer-size.c index 526c90e..72f742a 100644 --- a/src/trg-cell-renderer-size.c +++ b/src/trg-cell-renderer-size.c @@ -90,7 +90,7 @@ trg_cell_renderer_size_class_init(TrgCellRendererSizeClass * klass) "Size Value", "Size Value", 0, - INT64_MAX, + G_MAXINT64, 0, G_PARAM_READWRITE | diff --git a/src/trg-cell-renderer-speed.c b/src/trg-cell-renderer-speed.c index bea429e..b2396fb 100644 --- a/src/trg-cell-renderer-speed.c +++ b/src/trg-cell-renderer-speed.c @@ -90,7 +90,7 @@ trg_cell_renderer_speed_class_init(TrgCellRendererSpeedClass * klass) "Speed Value", "Speed Value", 0, - INT64_MAX, + G_MAXINT64, 0, G_PARAM_READWRITE | diff --git a/src/win32-mailslot.c b/src/win32-mailslot.c index d000281..cca051f 100644 --- a/src/win32-mailslot.c +++ b/src/win32-mailslot.c @@ -19,7 +19,7 @@ #if WIN32 -#define TRG_MAILSLOT_NAME "\\\\.\\mailslot\\TransmissionRemoteGTK" //Name given to the Mailslot +#define TRG_MAILSLOT_NAME "\\\\.\\mailslot\\TransmissionRemoteGTK" #define MAILSLOT_BUFFER_SIZE 1024*32 #include @@ -65,10 +65,10 @@ static gpointer mailslot_recv_thread(gpointer data) DWORD cbBytes; BOOL bResult; - hMailslot = CreateMailslot(TRG_MAILSLOT_NAME, // mailslot name - MAILSLOT_BUFFER_SIZE, // input buffer size - MAILSLOT_WAIT_FOREVER, // no timeout - NULL); // default security attribute + hMailslot = CreateMailslot(TRG_MAILSLOT_NAME, /* mailslot name */ + MAILSLOT_BUFFER_SIZE, /* input buffer size */ + MAILSLOT_WAIT_FOREVER, /* no timeout */ + NULL); /* default security attribute */ if (INVALID_HANDLE_VALUE == hMailslot) { g_error("\nError occurred while creating the mailslot: %d", @@ -77,11 +77,11 @@ static gpointer mailslot_recv_thread(gpointer data) } while (1) { - bResult = ReadFile(hMailslot, // handle to mailslot - szBuffer, // buffer to receive data - sizeof(szBuffer), // size of buffer - &cbBytes, // number of bytes read - NULL); // not overlapped I/O + bResult = ReadFile(hMailslot, /* handle to mailslot */ + szBuffer, /* buffer to receive data */ + sizeof(szBuffer), // size of buffer */ + &cbBytes, /* number of bytes read */ + NULL); /* not overlapped I/O */ if ((!bResult) || (0 == cbBytes)) { g_error("Mailslot error from client: %d", GetLastError()); @@ -131,7 +131,7 @@ static gpointer mailslot_recv_thread(gpointer data) } CloseHandle(hMailslot); - return NULL; //Success + return NULL; /* Success */ } void mailslot_start_background_listener(TrgMainWindow * win) @@ -141,13 +141,13 @@ void mailslot_start_background_listener(TrgMainWindow * win) gboolean mailslot_send_message(gchar ** args) { - HANDLE hMailSlot = CreateFile(TRG_MAILSLOT_NAME, // mailslot name - GENERIC_WRITE, // mailslot write only - FILE_SHARE_READ, // required for mailslots - NULL, // default security attributes - OPEN_EXISTING, // opens existing mailslot - FILE_ATTRIBUTE_NORMAL, // normal attributes - NULL); // no template file + HANDLE hMailSlot = CreateFile(TRG_MAILSLOT_NAME, /* mailslot name */ + GENERIC_WRITE, /* mailslot write only */ + FILE_SHARE_READ, /* required for mailslots */ + NULL, /* default security attributes */ + OPEN_EXISTING, /* opens existing mailslot */ + FILE_ATTRIBUTE_NORMAL, /* normal attributes */ + NULL); /* no template file */ if (hMailSlot != INVALID_HANDLE_VALUE) { DWORD cbBytes; @@ -178,10 +178,10 @@ gboolean mailslot_send_message(gchar ** args) json_node_free(node); g_object_unref(generator); - WriteFile(hMailSlot, // handle to mailslot - msg, // buffer to write from - strlen(msg) + 1, // number of bytes to write, include the NULL - &cbBytes, // number of bytes written + WriteFile(hMailSlot, /* handle to mailslot */ + msg, /* buffer to write from */ + strlen(msg) + 1, /* number of bytes to write, include the NULL */ + &cbBytes, /* number of bytes written */ NULL); CloseHandle(hMailSlot); -- cgit v1.2.3