[gnome-commander] intviewer: use reference to buflen in gviewer_search_dlg_get_search_hex_buffer()
- From: Piotr Eljasiak <epiotr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] intviewer: use reference to buflen in gviewer_search_dlg_get_search_hex_buffer()
- Date: Sun, 8 Jan 2012 22:28:45 +0000 (UTC)
commit 79b0d7b23684fca82635fc25c612b75ad490281a
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Sun Jan 8 23:28:04 2012 +0100
intviewer: use reference to buflen in gviewer_search_dlg_get_search_hex_buffer()
src/intviewer/search-dlg.cc | 5 ++---
src/intviewer/search-dlg.h | 2 +-
src/intviewer/viewer-window.cc | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/intviewer/search-dlg.cc b/src/intviewer/search-dlg.cc
index ec4d42f..d4e2727 100644
--- a/src/intviewer/search-dlg.cc
+++ b/src/intviewer/search-dlg.cc
@@ -57,18 +57,17 @@ struct GViewerSearchDlgPrivate
};
-guint8 *gviewer_search_dlg_get_search_hex_buffer (GViewerSearchDlg *sdlg, /*out*/ guint *buflen)
+guint8 *gviewer_search_dlg_get_search_hex_buffer (GViewerSearchDlg *sdlg, /*out*/ guint &buflen)
{
g_return_val_if_fail (sdlg!=NULL, NULL);
g_return_val_if_fail (sdlg->priv!=NULL, NULL);
- g_return_val_if_fail (buflen!=NULL, NULL);
g_return_val_if_fail (sdlg->priv->search_hex_buffer!=NULL, NULL);
g_return_val_if_fail (sdlg->priv->search_hex_buflen>0, NULL);
guint8 *result = g_new0 (guint8, sdlg->priv->search_hex_buflen);
memcpy (result, sdlg->priv->search_hex_buffer, sdlg->priv->search_hex_buflen);
- *buflen = sdlg->priv->search_hex_buflen;
+ buflen = sdlg->priv->search_hex_buflen;
return result;
}
diff --git a/src/intviewer/search-dlg.h b/src/intviewer/search-dlg.h
index c269cc5..c9ee5e4 100644
--- a/src/intviewer/search-dlg.h
+++ b/src/intviewer/search-dlg.h
@@ -58,7 +58,7 @@ SEARCHMODE gviewer_search_dlg_get_search_mode (GViewerSearchDlg *sdlg);
gchar *gviewer_search_dlg_get_search_text_string (GViewerSearchDlg *sdlg);
/* returned buffer is "g_new0-ed", caller must "g_free" it */
-guint8 *gviewer_search_dlg_get_search_hex_buffer (GViewerSearchDlg *sdlg, /*out*/ guint *buflen);
+guint8 *gviewer_search_dlg_get_search_hex_buffer (GViewerSearchDlg *sdlg, /*out*/ guint &buflen);
gboolean gviewer_search_dlg_get_case_sensitive (GViewerSearchDlg *sdlg);
diff --git a/src/intviewer/viewer-window.cc b/src/intviewer/viewer-window.cc
index 5b8505d..68846b9 100644
--- a/src/intviewer/viewer-window.cc
+++ b/src/intviewer/viewer-window.cc
@@ -1170,7 +1170,7 @@ static void menu_edit_find(GtkMenuItem *item, GViewerWindow *obj)
{
// Hex Search
guint buflen;
- guint8 *buffer = gviewer_search_dlg_get_search_hex_buffer (srch_dlg, &buflen);
+ guint8 *buffer = gviewer_search_dlg_get_search_hex_buffer (srch_dlg, buflen);
g_return_if_fail (buffer!=NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]