Rev 1547: Attempt to fix value parsing on 64bit. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Mon Aug 4 16:37:32 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1547
revision-id: jelmer at samba.org-20080804153730-cyn0ojl8tg2fgum3
parent: jelmer at samba.org-20080803145412-rye8lxuww7orgh5m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-08-04 17:37:30 +0200
message:
  Attempt to fix value parsing on 64bit.
modified:
  editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
=== modified file 'editor.c'
--- a/editor.c	2008-08-02 00:14:43 +0000
+++ b/editor.c	2008-08-04 15:37:30 +0000
@@ -186,14 +186,18 @@
 	EditorObject *editor = (EditorObject *)self;
 	char *name;
    	svn_string_t c_value;
+	int vallen;
 
 	if (!FileEditor_Check(self)) {
 		PyErr_BadArgument();
 		return NULL;
 	}
 
-	if (!PyArg_ParseTuple(args, "sz#", &name, &c_value.data, &c_value.len))
+	if (!PyArg_ParseTuple(args, "sz#", &name, &c_value.data, &vallen))
 		return NULL;
+
+	c_value.len = vallen;
+
 	RUN_SVN(editor->editor->change_file_prop(editor->baton, name, 
 				&c_value, editor->pool));
 	Py_RETURN_NONE;
@@ -353,19 +357,20 @@
 	char *name;
 	svn_string_t c_value, *p_c_value;
 	EditorObject *editor = (EditorObject *)self;
+	int vallen;
 
 	if (!DirectoryEditor_Check(self)) {
 		PyErr_BadArgument();
 		return NULL;
 	}
 
-	if (!PyArg_ParseTuple(args, "sz#", &name, &c_value.data, &c_value.len))
+	if (!PyArg_ParseTuple(args, "sz#", &name, &c_value.data, &vallen))
 		return NULL;
 
-	p_c_value = &c_value;
+	c_value.len = vallen;
 
 	RUN_SVN(editor->editor->change_dir_prop(editor->baton, name, 
-					p_c_value, editor->pool));
+					&c_value, editor->pool));
 
 	Py_RETURN_NONE;
 }




More information about the bazaar-commits mailing list