[Ocfs2-tools-commits] manish commits r980 - trunk/ocfs2console/ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-07-01 19:18:08 -0500 (Fri, 01 Jul 2005)
New Revision: 980

Modified:
   trunk/ocfs2console/ocfs2interface/o2cbmodule.c
   trunk/ocfs2console/ocfs2interface/ocfs2module.c
   trunk/ocfs2console/ocfs2interface/plistmodule.c
Log:
METH_KEYWORDS implies METH_VARARGS


Modified: trunk/ocfs2console/ocfs2interface/o2cbmodule.c
===================================================================
--- trunk/ocfs2console/ocfs2interface/o2cbmodule.c	2005-06-28 00:18:50 UTC (rev 979)
+++ trunk/ocfs2console/ocfs2interface/o2cbmodule.c	2005-07-02 00:18:08 UTC (rev 980)
@@ -268,9 +268,9 @@
 }
 #endif
 static PyMethodDef cluster_methods[] = {
-  {"add_node", (PyCFunction)cluster_add_node, METH_VARARGS | METH_KEYWORDS},
-//  {"create_heartbeat_region_disk", (PyCFunction)cluster_create_heartbeat_region_disk, METH_VARARGS | METH_KEYWORDS},
-//  {"remove_heartbeat_region_disk", (PyCFunction)cluster_remove_heartbeat_region_disk, METH_VARARGS | METH_KEYWORDS},
+  {"add_node", (PyCFunction)cluster_add_node, METH_KEYWORDS},
+//  {"create_heartbeat_region_disk", (PyCFunction)cluster_create_heartbeat_region_disk, METH_KEYWORDS},
+//  {"remove_heartbeat_region_disk", (PyCFunction)cluster_remove_heartbeat_region_disk, METH_KEYWORDS},
   {NULL, NULL}
 };
 
@@ -509,8 +509,8 @@
 
 static PyMethodDef o2cb_methods[] = {
   {"list_clusters", (PyCFunction)list_clusters, METH_NOARGS},
-//  {"create_heartbeat_region_disk", (PyCFunction)create_heartbeat_region_disk, METH_VARARGS | METH_KEYWORDS},
-//  {"remove_heartbeat_region_disk", (PyCFunction)remove_heartbeat_region_disk, METH_VARARGS | METH_KEYWORDS},
+//  {"create_heartbeat_region_disk", (PyCFunction)create_heartbeat_region_disk, METH_KEYWORDS},
+//  {"remove_heartbeat_region_disk", (PyCFunction)remove_heartbeat_region_disk, METH_KEYWORDS},
   {"get_hb_ctl_path", (PyCFunction)get_hb_ctl_path, METH_NOARGS},
   {NULL,       NULL}    /* sentinel */
 };

Modified: trunk/ocfs2console/ocfs2interface/ocfs2module.c
===================================================================
--- trunk/ocfs2console/ocfs2interface/ocfs2module.c	2005-06-28 00:18:50 UTC (rev 979)
+++ trunk/ocfs2console/ocfs2interface/ocfs2module.c	2005-07-02 00:18:08 UTC (rev 980)
@@ -855,15 +855,15 @@
 
 static PyMethodDef fs_methods[] = {
   {"flush", (PyCFunction)fs_flush, METH_NOARGS},
-  {"clusters_to_blocks", (PyCFunction)fs_clusters_to_blocks, METH_VARARGS | METH_KEYWORDS},
-  {"blocks_to_clusters", (PyCFunction)fs_blocks_to_clusters, METH_VARARGS | METH_KEYWORDS},
-  {"blocks_in_bytes", (PyCFunction)fs_blocks_in_bytes, METH_VARARGS | METH_KEYWORDS},
-  {"clusters_in_blocks", (PyCFunction)fs_clusters_in_blocks, METH_VARARGS | METH_KEYWORDS},
-  {"block_out_of_range", (PyCFunction)fs_block_out_of_range, METH_VARARGS | METH_KEYWORDS},
-  {"lookup_system_inode", (PyCFunction)fs_lookup_system_inode, METH_VARARGS | METH_KEYWORDS},
-  {"read_cached_inode", (PyCFunction)fs_read_cached_inode, METH_VARARGS | METH_KEYWORDS},
-  {"dir_iterate", (PyCFunction)fs_dir_iterate, METH_VARARGS | METH_KEYWORDS},
-  {"iterdir", (PyCFunction)fs_dir_scan, METH_VARARGS | METH_KEYWORDS},
+  {"clusters_to_blocks", (PyCFunction)fs_clusters_to_blocks, METH_KEYWORDS},
+  {"blocks_to_clusters", (PyCFunction)fs_blocks_to_clusters, METH_KEYWORDS},
+  {"blocks_in_bytes", (PyCFunction)fs_blocks_in_bytes, METH_KEYWORDS},
+  {"clusters_in_blocks", (PyCFunction)fs_clusters_in_blocks, METH_KEYWORDS},
+  {"block_out_of_range", (PyCFunction)fs_block_out_of_range, METH_KEYWORDS},
+  {"lookup_system_inode", (PyCFunction)fs_lookup_system_inode, METH_KEYWORDS},
+  {"read_cached_inode", (PyCFunction)fs_read_cached_inode, METH_KEYWORDS},
+  {"dir_iterate", (PyCFunction)fs_dir_iterate, METH_KEYWORDS},
+  {"iterdir", (PyCFunction)fs_dir_scan, METH_KEYWORDS},
   {NULL, NULL}
 };
 

Modified: trunk/ocfs2console/ocfs2interface/plistmodule.c
===================================================================
--- trunk/ocfs2console/ocfs2interface/plistmodule.c	2005-06-28 00:18:50 UTC (rev 979)
+++ trunk/ocfs2console/ocfs2interface/plistmodule.c	2005-07-02 00:18:08 UTC (rev 980)
@@ -140,7 +140,7 @@
 }
 
 static PyMethodDef plist_methods[] = {
-  {"partition_list", (PyCFunction)partition_list, METH_VARARGS | METH_KEYWORDS},
+  {"partition_list", (PyCFunction)partition_list, METH_KEYWORDS},
   {NULL,       NULL}    /* sentinel */
 };