rename ReceiveCommandP -> ReceiveCommandPoll for consistency

diff --git a/client/cli.c b/client/cli.c
index 9863b898cdfecd30c24f59bccbbc0f13f2021b03..f6162227e681b2c06f76370dcfe63b1ec2d38744 100644 (file)
--- a/client/cli.c
+++ b/client/cli.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
                        ReceiveCommand(&cmdbuf);
                        HANDLE_ERROR
                        for (i=0; i<5; i++) {
                        ReceiveCommand(&cmdbuf);
                        HANDLE_ERROR
                        for (i=0; i<5; i++) {

-                               ReceiveCommandP(&cmdbuf);
+                               ReceiveCommandPoll(&cmdbuf);

                        }
                        HANDLE_ERROR
 
                        }
                        HANDLE_ERROR
 

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 4c6076bc83cbac16b52aecb65cc48a63e2d9f048..280d07f91fbc3b51d04e1221a61bc05f0d4deb11 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -26,7 +26,7 @@ static void *usb_receiver(void *targ) {
        UsbCommand cmdbuf;
 
        while(arg->run) {
        UsbCommand cmdbuf;
 
        while(arg->run) {

-               if (ReceiveCommandP(&cmdbuf) > 0) {
+               if (ReceiveCommandPoll(&cmdbuf)) {

                        int i;
 
                        for (i=0; i<strlen(PROXPROMPT); i++)
                        int i;
 
                        for (i=0; i<strlen(PROXPROMPT); i++)

diff --git a/client/snooper.c b/client/snooper.c
index a7a8894abfa85280baf0441dd3370b439e8f7445..e6d4c364599586462f51055402c72e4fc5f80e3b 100644 (file)
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -34,7 +34,7 @@ int main()
                        ReceiveCommand(&cmdbuf);
                        HANDLE_ERROR
                        for (i=0; i<5; i++) {
                        ReceiveCommand(&cmdbuf);
                        HANDLE_ERROR
                        for (i=0; i<5; i++) {

-                               ReceiveCommandP(&cmdbuf);
+                               ReceiveCommandPoll(&cmdbuf);

                        }
                        HANDLE_ERROR
 
                        }
                        HANDLE_ERROR
 

diff --git a/client/usb.c b/client/usb.c
index 8f5f38a7179736f69b851157a7ea8d25c25c4c22..e7573feafdad1c05eea39dc7766f3dd742d5f965 100644 (file)
--- a/client/usb.c
+++ b/client/usb.c
@@ -51,7 +51,7 @@ void SendCommand(UsbCommand *c, bool wantAck) {
        }
 }
 
        }
 }
 

-int ReceiveCommandP(UsbCommand *c) {
+bool ReceiveCommandPoll(UsbCommand *c) {

        int ret;
 
        bzero(c, sizeof(UsbCommand));
        int ret;
 
        bzero(c, sizeof(UsbCommand));


@@ -96,11 +96,11 @@ int ReceiveCommandP(UsbCommand *c) {
 #endif
        }
 
 #endif
        }
 

-       return ret;
+       return ret > 0;

 }
 
 void ReceiveCommand(UsbCommand *c) {
 }
 
 void ReceiveCommand(UsbCommand *c) {

-       while(ReceiveCommandP(c)<0) {}
+       while(!ReceiveCommandPoll(c)) {}

 }
 
 usb_dev_handle* findProxmark(int verbose, unsigned int *iface) {
 }
 
 usb_dev_handle* findProxmark(int verbose, unsigned int *iface) {