svn commit: samba r2254 - in branches/SAMBA_4_0/source: gtk/common
gtk/tools lib/registry/common lib/registry/reg_backend_ldb
lib/registry/reg_backend_rpc
jelmer at samba.org
jelmer at samba.org
Wed Sep 8 12:41:13 GMT 2004
Author: jelmer
Date: 2004-09-08 12:41:12 +0000 (Wed, 08 Sep 2004)
New Revision: 2254
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2254&nolog=1
Log:
Fix a couple of compiler warnings...
Modified:
branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
branches/SAMBA_4_0/source/gtk/tools/gregedit.c
branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
branches/SAMBA_4_0/source/lib/registry/common/registry.h
branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c
branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc/reg_backend_rpc.c
Changeset:
Modified: branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2004-09-08 11:54:01 UTC (rev 2253)
+++ branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2004-09-08 12:41:12 UTC (rev 2254)
@@ -47,9 +47,9 @@
static void on_browse_activate (GtkButton *button, gpointer user_data)
{
GtkRpcBindingDialog *rbd = user_data;
- GtkSelectHostDialog *shd = gtk_select_host_dialog_new(TRUE);
+ GtkWidget *shd = gtk_select_host_dialog_new(TRUE);
if(gtk_dialog_run(GTK_DIALOG(shd)) == GTK_RESPONSE_ACCEPT) {
- gtk_entry_set_text(GTK_ENTRY(rbd->entry_host), gtk_select_host_dialog_get_host(shd));
+ gtk_entry_set_text(GTK_ENTRY(rbd->entry_host), gtk_select_host_dialog_get_host(GTK_SELECT_HOST_DIALOG(shd)));
}
gtk_widget_destroy(GTK_WIDGET(shd));
@@ -61,8 +61,6 @@
GtkWidget *vbox1;
GtkWidget *vbox6;
GtkWidget *frame_transport;
- GtkWidget *hbox2;
- GtkWidget *lbl_transport;
GtkWidget *label1;
GtkWidget *frame_host;
GtkWidget *hbox1;
@@ -285,7 +283,6 @@
const char *transport;
const char *host;
char *options = NULL;
- char *binding = NULL;
/* Format: TRANSPORT:host:[\pipe\foo,foo,foo] */
@@ -318,7 +315,6 @@
{
GtkWidget *samba_about_dialog;
GtkWidget *dialog_vbox1;
- GtkWidget *image1;
GtkWidget *label1;
GtkWidget *label3;
GtkWidget *label2;
Modified: branches/SAMBA_4_0/source/gtk/tools/gregedit.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/tools/gregedit.c 2004-09-08 11:54:01 UTC (rev 2253)
+++ branches/SAMBA_4_0/source/gtk/tools/gregedit.c 2004-09-08 12:41:12 UTC (rev 2254)
@@ -40,7 +40,6 @@
GtkTreeIter firstiter, iter, tmpiter;
REG_KEY *k, *sub;
char *name;
- GValue value;
WERROR error;
int i;
@@ -330,7 +329,6 @@
GtkWidget *tree_vals;
GtkWidget *statusbar;
GtkAccelGroup *accel_group;
- GtkTreeIter iter, child;
accel_group = gtk_accel_group_new ();
Modified: branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c 2004-09-08 11:54:01 UTC (rev 2253)
+++ branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c 2004-09-08 12:41:12 UTC (rev 2254)
@@ -30,9 +30,9 @@
static struct reg_init_function_entry *reg_find_backend_entry(const char *name);
/* Register new backend */
-NTSTATUS registry_register(void *_function)
+NTSTATUS registry_register(const void *_function)
{
- struct registry_ops *functions = _function;
+ const struct registry_ops *functions = _function;
struct reg_init_function_entry *entry = backends;
if (!functions || !functions->name) {
@@ -97,7 +97,6 @@
struct reg_init_function_entry *entry;
TALLOC_CTX *mem_ctx;
REG_HANDLE *ret;
- NTSTATUS status;
WERROR werr;
entry = reg_find_backend_entry(backend);
Modified: branches/SAMBA_4_0/source/lib/registry/common/registry.h
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/common/registry.h 2004-09-08 11:54:01 UTC (rev 2253)
+++ branches/SAMBA_4_0/source/lib/registry/common/registry.h 2004-09-08 12:41:12 UTC (rev 2254)
@@ -123,7 +123,7 @@
};
struct reg_handle_s {
- struct registry_ops *functions;
+ const struct registry_ops *functions;
char *location;
char *credentials;
void *backend_data;
@@ -132,7 +132,7 @@
struct reg_init_function_entry {
/* Function to create a member of the pdb_methods list */
- struct registry_ops *functions;
+ const struct registry_ops *functions;
struct reg_init_function_entry *prev, *next;
};
Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c 2004-09-08 11:54:01 UTC (rev 2253)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c 2004-09-08 12:41:12 UTC (rev 2254)
@@ -89,15 +89,13 @@
static WERROR ldb_fetch_subkeys(REG_KEY *k, int *count, REG_KEY ***subkeys)
{
struct ldb_context *c = k->handle->backend_data;
- char *path;
int ret, i, j;
struct ldb_message **msg;
- REG_KEY *key = NULL;
ret = ldb_search(c, (char *)k->backend_data, LDB_SCOPE_ONELEVEL, "(key=*)", NULL,&msg);
if(ret < 0) {
- DEBUG(0, ("Error getting subkeys for '%s': %s\n", k->backend_data, ldb_errstring(c)));
+ DEBUG(0, ("Error getting subkeys for '%s': %s\n", (char *)k->backend_data, ldb_errstring(c)));
return WERR_FOOBAR;
}
@@ -126,15 +124,13 @@
static WERROR ldb_fetch_values(REG_KEY *k, int *count, REG_VAL ***values)
{
struct ldb_context *c = k->handle->backend_data;
- char *path;
int ret, i, j;
struct ldb_message **msg;
- REG_KEY *key = NULL;
ret = ldb_search(c, (char *)k->backend_data, LDB_SCOPE_ONELEVEL, "(value=*)", NULL,&msg);
if(ret < 0) {
- DEBUG(0, ("Error getting values for '%s': %s\n", k->backend_data, ldb_errstring(c)));
+ DEBUG(0, ("Error getting values for '%s': %s\n", (char *)k->backend_data, ldb_errstring(c)));
return WERR_FOOBAR;
}
@@ -170,9 +166,8 @@
static WERROR ldb_open_key(REG_HANDLE *h, int num, const char *name, REG_KEY **key)
{
struct ldb_context *c = h->backend_data;
- char *path;
struct ldb_message **msg;
- char *ldap_path, *new_ldap_path;
+ char *ldap_path;
int ret;
TALLOC_CTX *mem_ctx = talloc_init("ldb_path");
if(num != 0) return WERR_NO_MORE_ITEMS;
Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc/reg_backend_rpc.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc/reg_backend_rpc.c 2004-09-08 11:54:01 UTC (rev 2253)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc/reg_backend_rpc.c 2004-09-08 12:41:12 UTC (rev 2254)
@@ -128,8 +128,6 @@
static WERROR rpc_key_put_rpc_data(REG_KEY *k, struct rpc_key_data **data)
{
struct winreg_OpenKey r;
- int i;
- struct rpc_data *mydata = k->handle->backend_data;
WERROR error;
REG_KEY *hivekey;
struct rpc_key_data *mykeydata;
@@ -254,7 +252,6 @@
struct winreg_EnumKeyNameRequest keyname;
struct winreg_String classname;
struct winreg_Time tm;
- struct rpc_data *mydata = parent->handle->backend_data;
struct rpc_key_data *mykeydata = parent->backend_data;
WERROR error;
NTSTATUS status;
More information about the samba-cvs
mailing list