Skip to content

Commit b682c32

Browse files
bwolmaransbwolmarans
committedSep 6, 2017
Fix agent-master whitespace to match dev
This makes diffing easier during agent releases driver/event_table.c from 1435a3f driver/ppm.h from fd896b7 driver/ppm_events.c from e8f6630
1 parent 97d177b commit b682c32

File tree

3 files changed

+43
-55
lines changed

3 files changed

+43
-55
lines changed
 

‎driver/event_table.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ const struct ppm_event_info g_event_info[PPM_EVENT_MAX] = {
289289
/* PPME_SYSCALL_ACCESS_E */{"access", EC_FILE, EF_NONE, 1, {{"mode", PT_FLAGS32, PF_HEX, access_flags} } },
290290
/* PPME_SYSCALL_ACCESS_X */{"access", EC_FILE, EF_NONE, 2, {{"res", PT_ERRNO, PF_DEC}, {"name", PT_FSPATH, PF_NA} } },
291291
/* PPME_SYSCALL_CHROOT_E */{"chroot", EC_PROCESS, EF_MODIFIES_STATE, 0},
292-
/* PPME_SYSCALL_CHROOT_X */{"chroot", EC_PROCESS, EF_MODIFIES_STATE, 2, {{"res", PT_ERRNO, PF_DEC}, {"path", PT_FSPATH, PF_NA} }},
292+
/* PPME_SYSCALL_CHROOT_X */{"chroot", EC_PROCESS, EF_MODIFIES_STATE, 2, {{"res", PT_ERRNO, PF_DEC}, {"path", PT_FSPATH, PF_NA} } },
293293
/* PPME_TRACER_E */{"tracer", EC_OTHER, EF_NONE, 3, {{"id", PT_INT64, PF_DEC}, {"tags", PT_CHARBUFARRAY, PF_NA}, {"args", PT_CHARBUF_PAIR_ARRAY, PF_NA} } },
294-
/* PPME_TRACER_X */{ "tracer", EC_OTHER, EF_NONE, 3,{ { "id", PT_INT64, PF_DEC },{ "tags", PT_CHARBUFARRAY, PF_NA },{ "args", PT_CHARBUF_PAIR_ARRAY, PF_NA } } },
294+
/* PPME_TRACER_X */{ "tracer", EC_OTHER, EF_NONE, 3, { { "id", PT_INT64, PF_DEC }, { "tags", PT_CHARBUFARRAY, PF_NA }, { "args", PT_CHARBUF_PAIR_ARRAY, PF_NA } } },
295295
/* PPME_MESOS_E */{"mesos", EC_INTERNAL, EF_SKIPPARSERESET | EF_MODIFIES_STATE, 1, {{"json", PT_CHARBUF, PF_NA} } },
296296
/* PPME_MESOS_X */{"NA4", EC_SYSTEM, EF_UNUSED, 0},
297297
/* PPME_CONTAINER_JSON_E */{"container", EC_INTERNAL, EF_SKIPPARSERESET | EF_MODIFIES_STATE, 1, {{"json", PT_CHARBUF, PF_NA} } },

‎driver/ppm.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
1616
along with sysdig. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include<linux/version.h>
19+
#include <linux/version.h>
2020

2121
/*
2222
* Our Own ASSERT implementation, so we can easily switch among BUG_ON, WARN_ON and nothing
@@ -127,4 +127,4 @@ long ppm_strncpy_from_user(char *to, const char __user *from, unsigned long n);
127127

128128
extern const struct syscall_evt_pair g_syscall_table[];
129129
extern const struct ppm_event_info g_event_info[];
130-
extern const enum ppm_syscall_code g_syscall_code_routing_table[];
130+
extern const enum ppm_syscall_code g_syscall_code_routing_table[];

‎driver/ppm_events.c

+39-51
Original file line numberDiff line numberDiff line change
@@ -701,113 +701,101 @@ int val_to_ring(struct event_filler_arguments *args, uint64_t val, u16 val_len,
701701

702702
static inline u8 socket_family_to_scap(u8 family)
703703
{
704-
if (family == AF_INET) {
704+
if (family == AF_INET)
705705
return PPM_AF_INET;
706-
} else if (family == AF_INET6) {
706+
else if (family == AF_INET6)
707707
return PPM_AF_INET6;
708-
} else if (family == AF_UNIX) {
708+
else if (family == AF_UNIX)
709709
return PPM_AF_UNIX;
710-
} else if (family == AF_NETLINK) {
710+
else if (family == AF_NETLINK)
711711
return PPM_AF_NETLINK;
712-
} else if (family == AF_PACKET) {
712+
else if (family == AF_PACKET)
713713
return PPM_AF_PACKET;
714-
} else if (family == AF_UNSPEC) {
714+
else if (family == AF_UNSPEC)
715715
return PPM_AF_UNSPEC;
716-
} else if (family == AF_AX25) {
716+
else if (family == AF_AX25)
717717
return PPM_AF_AX25;
718-
} else if (family == AF_IPX) {
718+
else if (family == AF_IPX)
719719
return PPM_AF_IPX;
720-
} else if (family == AF_APPLETALK) {
720+
else if (family == AF_APPLETALK)
721721
return PPM_AF_APPLETALK;
722-
} else if (family == AF_NETROM) {
722+
else if (family == AF_NETROM)
723723
return PPM_AF_NETROM;
724-
} else if (family == AF_BRIDGE) {
724+
else if (family == AF_BRIDGE)
725725
return PPM_AF_BRIDGE;
726-
} else if (family == AF_ATMPVC) {
726+
else if (family == AF_ATMPVC)
727727
return PPM_AF_ATMPVC;
728-
} else if (family == AF_X25) {
728+
else if (family == AF_X25)
729729
return PPM_AF_X25;
730-
} else if (family == AF_ROSE) {
730+
else if (family == AF_ROSE)
731731
return PPM_AF_ROSE;
732-
} else if (family == AF_DECnet) {
732+
else if (family == AF_DECnet)
733733
return PPM_AF_DECnet;
734-
} else if (family == AF_NETBEUI) {
734+
else if (family == AF_NETBEUI)
735735
return PPM_AF_NETBEUI;
736-
} else if (family == AF_SECURITY) {
736+
else if (family == AF_SECURITY)
737737
return PPM_AF_SECURITY;
738-
} else if (family == AF_KEY) {
738+
else if (family == AF_KEY)
739739
return PPM_AF_KEY;
740-
} else if (family == AF_ROUTE) {
740+
else if (family == AF_ROUTE)
741741
return PPM_AF_ROUTE;
742-
} else if (family == AF_ASH) {
742+
else if (family == AF_ASH)
743743
return PPM_AF_ASH;
744-
} else if (family == AF_ECONET) {
744+
else if (family == AF_ECONET)
745745
return PPM_AF_ECONET;
746-
} else if (family == AF_ATMSVC) {
746+
else if (family == AF_ATMSVC)
747747
return PPM_AF_ATMSVC;
748-
}
749748
#ifdef AF_RDS
750-
else if (family == AF_RDS) {
749+
else if (family == AF_RDS)
751750
return PPM_AF_RDS;
752-
}
753751
#endif
754-
else if (family == AF_SNA) {
752+
else if (family == AF_SNA)
755753
return PPM_AF_SNA;
756-
} else if (family == AF_IRDA) {
754+
else if (family == AF_IRDA)
757755
return PPM_AF_IRDA;
758-
} else if (family == AF_PPPOX) {
756+
else if (family == AF_PPPOX)
759757
return PPM_AF_PPPOX;
760-
} else if (family == AF_WANPIPE) {
758+
else if (family == AF_WANPIPE)
761759
return PPM_AF_WANPIPE;
762-
} else if (family == AF_LLC) {
760+
else if (family == AF_LLC)
763761
return PPM_AF_LLC;
764-
}
765762
#ifdef AF_CAN
766-
else if (family == AF_CAN) {
763+
else if (family == AF_CAN)
767764
return PPM_AF_CAN;
768-
}
769765
#endif
770-
else if (family == AF_TIPC) {
766+
else if (family == AF_TIPC)
771767
return PPM_AF_TIPC;
772-
} else if (family == AF_BLUETOOTH) {
768+
else if (family == AF_BLUETOOTH)
773769
return PPM_AF_BLUETOOTH;
774-
} else if (family == AF_IUCV) {
770+
else if (family == AF_IUCV)
775771
return PPM_AF_IUCV;
776-
}
777772
#ifdef AF_RXRPC
778-
else if (family == AF_RXRPC) {
773+
else if (family == AF_RXRPC)
779774
return PPM_AF_RXRPC;
780-
}
781775
#endif
782776
#ifdef AF_ISDN
783-
else if (family == AF_ISDN) {
777+
else if (family == AF_ISDN)
784778
return PPM_AF_ISDN;
785-
}
786779
#endif
787780
#ifdef AF_PHONET
788-
else if (family == AF_PHONET) {
781+
else if (family == AF_PHONET)
789782
return PPM_AF_PHONET;
790-
}
791783
#endif
792784
#ifdef AF_IEEE802154
793-
else if (family == AF_IEEE802154) {
785+
else if (family == AF_IEEE802154)
794786
return PPM_AF_IEEE802154;
795-
}
796787
#endif
797788
#ifdef AF_CAIF
798-
else if (family == AF_CAIF) {
789+
else if (family == AF_CAIF)
799790
return PPM_AF_CAIF;
800-
}
801791
#endif
802792
#ifdef AF_ALG
803-
else if (family == AF_ALG) {
793+
else if (family == AF_ALG)
804794
return PPM_AF_ALG;
805-
}
806795
#endif
807796
#ifdef AF_NFC
808-
else if (family == AF_NFC) {
797+
else if (family == AF_NFC)
809798
return PPM_AF_NFC;
810-
}
811799
#endif
812800
else {
813801
ASSERT(false);

0 commit comments

Comments
 (0)
Failed to load comments.