[PATCH] DocBook: allow to mark structure members private (aeec46b9) · Commits · 戴 / test

include/linux/usb.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -819,7 +819,7 @@ typedef void (usb_complete_t)(struct urb , struct pt_regs *);
		*/
		struct urb
		{
		/* private, usb core and host controller only fields in the urb */
		/* private: usb core and host controller only fields in the urb */
		struct kref kref; /* reference count of the URB */
		spinlock_t lock; /* lock for the URB */
		void hcpriv; / private data for host controller */
		@@ -827,7 +827,7 @@ struct urb
		atomic_t use_count; /* concurrent submissions counter */
		u8 reject; /* submissions will fail */

		/* public, documented fields in the urb that can be used by drivers */
		/* public: documented fields in the urb that can be used by drivers */
		struct list_head urb_list; /* list head for use by the urb's
		* current owner */
		struct usb_device dev; / (in) pointer to associated device */
		@@ -1045,7 +1045,7 @@ struct usb_sg_request {
		size_t bytes;

		/*
		* members below are private to usbcore,
		* members below are private: to usbcore,
		* and are not provided for driver access!
		*/
		spinlock_t lock;

+11 −2

Original line number	Diff line number	Diff line
		@@ -117,6 +117,8 @@ use strict;
		# struct my_struct {
		# int a;
		# int b;
		# /* private: */
		# int c;
		# };
		#
		# All descriptions can be multiline, except the short function description.
		@@ -1304,6 +1306,12 @@ sub dump_struct($$) {
		# ignore embedded structs or unions
		$members =~ s/{.*?}//g;

		# ignore members marked private:
		$members =~ s/\/\.?private:.?public:.?\*\///gos;
		$members =~ s/\/\.?private:.*//gos;
		# strip comments:
		$members =~ s/\/\.?\*\///gos;

		create_parameterlist($members, ';', $file);

		output_declaration($declaration_name,
		@@ -1329,6 +1337,7 @@ sub dump_enum($$) {
		my $x = shift;
		my $file = shift;

		$x =~ s@/\.?\*/@@gos; # strip comments.
		if ($x =~ /enum\s+(\w+)\s{(.)}/) {
		$declaration_name = $1;
		my $members = $2;
		@@ -1365,6 +1374,7 @@ sub dump_typedef($$) {
		my $x = shift;
		my $file = shift;

		$x =~ s@/\.?\*/@@gos; # strip comments.
		while (($x =~ /$.$\s;$/) \|\| ($x =~ /\[.\]\s;$/)) {
		$x =~ s/$.$\s;$/;/;
		$x =~ s/\[.\]\s;$/;/;
		@@ -1420,7 +1430,7 @@ sub create_parameterlist($$$) {
		$type = $arg;
		$type =~ s/([^\(]+\(\*)$param/$1/;
		push_parameter($param, $type, $file);
		} else {
		} elsif ($arg) {
		$arg =~ s/\s:\s/:/g;
		$arg =~ s/\s*\[/\[/g;

		@@ -1628,7 +1638,6 @@ sub process_state3_type($$) {
		my $x = shift;
		my $file = shift;

		$x =~ s@/\.?\*/@@gos; # strip comments.
		$x =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
		$x =~ s@^\s+@@gos; # strip leading spaces
		$x =~ s@\s+$@@gos; # strip trailing spaces