summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-11-27 20:58:45 +0000
committerJeremy Allison <jra@samba.org>2002-11-27 20:58:45 +0000
commitcb51beac60fc6d02b1ef1d2ee027ee90d84f5a95 (patch)
treea3dffe2d9e5895c5cf44ed08d68a27a09e23777f
parente65e16fdf60819a45d03862579e69be3b11d9118 (diff)
downloadsamba-cb51beac60fc6d02b1ef1d2ee027ee90d84f5a95.tar.gz
samba-cb51beac60fc6d02b1ef1d2ee027ee90d84f5a95.tar.bz2
samba-cb51beac60fc6d02b1ef1d2ee027ee90d84f5a95.zip
Remove use of 'F' - make 'f' and 'p' do unix (iso8859-1) encoding.
Jeremy. (This used to be commit e88bbec2a06bd92b8cfa33efdf166c4fa72cb656)
-rw-r--r--source3/python/py_tdbpack.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/source3/python/py_tdbpack.c b/source3/python/py_tdbpack.c
index 7a03f830ee..b79f96dbc6 100644
--- a/source3/python/py_tdbpack.c
+++ b/source3/python/py_tdbpack.c
@@ -235,13 +235,6 @@ pytdbpack_data(const char *format_str,
case 'f':
case 'P':
- if (!(packed_list = pytdbpack_str(ch, val_iter, packed_list, pytdb_dos_encoding)))
- return NULL;
- break;
-
- case 'F':
- /* We specify NULL encoding: Samba databases in this
- form are written in the default Python encoding. */
if (!(packed_list = pytdbpack_str(ch, val_iter, packed_list, pytdb_unix_encoding)))
return NULL;
break;
@@ -668,9 +661,6 @@ static PyObject *pytdbunpack_item(char ch,
result = pytdbunpack_uint32(pbuf, plen);
}
else if (ch == 'f' || ch == 'P') { /* nul-term string */
- result = pytdbunpack_string(pbuf, plen, pytdb_dos_encoding);
- }
- else if (ch == 'F') { /* nul-term string */
result = pytdbunpack_string(pbuf, plen, pytdb_unix_encoding);
}
else if (ch == 'B') { /* length, buffer */