Merge branch 'typo-fixes'

closes #28 closes #29 closes #30 closes #31
mguentner · Mar 9, 2021 · 99dc0d5 · 99dc0d5
2 parents aa0f0ec + bc3319a
commit 99dc0d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cannelloni.h b/cannelloni.h
@@ -47,7 +47,7 @@ struct __attribute__((__packed__)) CannelloniDataPacket {
 };
 
 /*
- * Since we are buffering CAN Frames, it is a good idea to
+ * Since we are buffering CAN Frames, it is a good idea
  * to order them by their identifier to mimic a CAN bus
  */
 struct canfd_frame_comp
@@ -56,7 +56,7 @@ struct canfd_frame_comp
                           const struct canfd_frame *f2) const
   {
     canid_t id1, id2;
-    /* Be extra careful when doing the comparision */
+    /* Be extra careful when doing the comparison */
     if (f1->can_id & CAN_EFF_FLAG)
       id1 = f1->can_id & CAN_EFF_MASK;
     else

diff --git a/canthread.cpp b/canthread.cpp
@@ -136,7 +136,7 @@ void CANThread::run() {
       receivedBytes = recv(m_canSocket, frame, sizeof(struct canfd_frame), 0);
       if (receivedBytes < 0) {
         if (errno == EWOULDBLOCK || errno == EAGAIN) {
-          /* Timeout occured */
+          /* Timeout occurred */
           m_peerThread->getFrameBuffer()->insertFramePool(frame);
           continue;
         } else {

diff --git a/sctpthread.cpp b/sctpthread.cpp
@@ -118,11 +118,11 @@ void SCTPThread::run() {
           lerror << "select error" << std::endl;
           continue;
         } else if (ret == 0) {
-          /* Timeout occured, checking whether m_started changed */
+          /* Timeout occurred, checking whether m_started changed */
           continue;
         } /* else */
         m_socket = accept(m_serverSocket,(struct sockaddr*) &connAddr, &connAddrLen);
-        /* Reject all further connection attemps */
+        /* Reject all further connection attempts */
         listen(m_serverSocket, 0);
         if (m_socket == -1) {
           lerror << "Error while accepting." << std::endl;
@@ -249,7 +249,7 @@ void SCTPThread::transmitFrame(canfd_frame *frame) {
     /* We need to drop that frame, since we are not connected */
     m_frameBuffer->insertFramePool(frame);
     if (m_debugOptions.udp) {
-      linfo << "Not connected. Droping frame" << std::endl;
+      linfo << "Not connected. Dropping frame" << std::endl;
     }
   }
 }

diff --git a/thread.h b/thread.h
@@ -30,7 +30,7 @@ class Thread {
     Thread();
     virtual ~Thread();
     virtual int start();
-    /* this is function tell the thread to stop */
+    /* this is the function to tell the thread to stop */
     virtual void stop();
     /* joins the thread */
     void join();